Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java =================================================================== diff -u -rd927914e80c12ea4cf2612788663209520c008c1 -r6e794692c1c8ad0a3e4e7a558dd429d5a2e0ca51 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java (.../MonitoringService.java) (revision d927914e80c12ea4cf2612788663209520c008c1) +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java (.../MonitoringService.java) (revision 6e794692c1c8ad0a3e4e7a558dd429d5a2e0ca51) @@ -1192,6 +1192,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());