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.195 -r1.195.2.1
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	14 Apr 2014 15:45:37 -0000	1.195
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	26 Aug 2014 10:21:35 -0000	1.195.2.1
@@ -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<Long>());