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.197 -r1.198
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	26 Aug 2014 10:17:22 -0000	1.197
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	22 Sep 2014 14:19:22 -0000	1.198
@@ -1440,11 +1440,14 @@
 		    }
 		    continue;
 		} else {
+		    ComplexActivity complexActivity = (ComplexActivity) getActivityById(currentActivity.getActivityId());
 		    // forget all records within complex activity
-		    for (Activity childActivity : (Set<Activity>) ((ComplexActivity) currentActivity).getActivities()) {
+		    for (Activity childActivity : (Set<Activity>) complexActivity.getActivities()) {
 			uncompleteActivities.add(childActivity);
 			if (childActivity.isComplexActivity()) {
-			    uncompleteActivities.addAll(((ComplexActivity) childActivity).getActivities());
+			    ComplexActivity complexChildActivity = (ComplexActivity) getActivityById(childActivity
+				    .getActivityId());
+			    uncompleteActivities.addAll(complexChildActivity.getActivities());
 			}
 
 			// mark the activity to be "unbranched"