Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
===================================================================
diff -u -r16593058f78a135e25dae055f0fc16c4bed4da42 -r5423c7eb88d56574ab07ec891ab2eccdcc3e582c
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	(.../MonitoringService.java)	(revision 16593058f78a135e25dae055f0fc16c4bed4da42)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	(.../MonitoringService.java)	(revision 5423c7eb88d56574ab07ec891ab2eccdcc3e582c)
@@ -1130,7 +1130,7 @@
 		    }
 		} else {
 		    // if group already exist
-		    learnerService.completeActivity(learner.getUserId(), activity, lessonId);
+		    learnerService.completeActivity(learner.getUserId(), activity, progress.getLearnerProgressId());
 		    if (MonitoringService.log.isDebugEnabled()) {
 			MonitoringService.log
 				.debug("Grouping activity [" + activity.getActivityId() + "] is completed.");
@@ -1142,7 +1142,7 @@
 		GateActivityDTO dto = learnerService.knockGate(gate, learner, false);
 		if (dto.getAllowToPass()) {
 		    // the gate is opened, continue to next activity to complete
-		    learnerService.completeActivity(learner.getUserId(), activity, lessonId);
+		    learnerService.completeActivity(learner.getUserId(), activity, progress.getLearnerProgressId());
 		    if (MonitoringService.log.isDebugEnabled()) {
 			MonitoringService.log.debug("Gate activity [" + gate.getActivityId() + "] is completed.");
 		    }
@@ -1174,7 +1174,7 @@
 
 		    learnerService.completeToolSession(toolSession.getToolSessionId(),
 			    new Long(learner.getUserId().longValue()));
-		    learnerService.completeActivity(learner.getUserId(), activity, lessonId);
+		    learnerService.completeActivity(learner.getUserId(), activity, progress.getLearnerProgressId());
 		    if (MonitoringService.log.isDebugEnabled()) {
 			MonitoringService.log.debug("Tool activity [" + activity.getActivityId() + "] is completed.");
 		    }
@@ -1187,7 +1187,7 @@
 		// branches are marked as done.
 		// Ditto the two types of optional activities.
 		// Then if the user goes back to them, they will operate normally.
-		learnerService.completeActivity(learner.getUserId(), activity, lessonId);
+		learnerService.completeActivity(learner.getUserId(), activity, progress.getLearnerProgressId());
 
 	    } else if (activity.isComplexActivity()) {
 		// expect it to be a parallel activity