Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java =================================================================== diff -u -raead34144651a924f76d7bca8645327e6820d226 -ra686fa0db7df185f15d9185b0d0d8c911da9bd6e --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java (.../MonitoringService.java) (revision aead34144651a924f76d7bca8645327e6820d226) +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java (.../MonitoringService.java) (revision a686fa0db7df185f15d9185b0d0d8c911da9bd6e) @@ -1345,6 +1345,8 @@ } // force complete operates on previous activity, not target stopPreviousActivity = stopActivity.getTransitionTo().getFromActivity(); + // de-proxy the activity + stopPreviousActivity = getActivityById(stopPreviousActivity.getActivityId()); } String stopReason = forceCompleteActivity(learner, lessonId, learnerProgress, currentActivity, stopPreviousActivity, new ArrayList());