Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java,v diff -u -r1.196 -r1.197 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java 12 Aug 2014 22:37:31 -0000 1.196 +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java 26 Aug 2014 10:17:22 -0000 1.197 @@ -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());