Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
===================================================================
diff -u -r6432c99a2551127c11e8d8fd10df6abdbfe1fe34 -r46fb7629237a6eeba8d9031655dbd7ed2ab25998
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	(.../MonitoringService.java)	(revision 6432c99a2551127c11e8d8fd10df6abdbfe1fe34)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	(.../MonitoringService.java)	(revision 46fb7629237a6eeba8d9031655dbd7ed2ab25998)
@@ -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"