Index: lams_common/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java
===================================================================
diff -u -r471b903caa3365758fbdec0a22440b1b0b3f2947 -rdbbe9d80bcbeda8f746963fcde183242996fcc68
--- lams_common/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java	(.../IMonitoringService.java)	(revision 471b903caa3365758fbdec0a22440b1b0b3f2947)
+++ lams_common/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java	(.../IMonitoringService.java)	(revision dbbe9d80bcbeda8f746963fcde183242996fcc68)
@@ -42,7 +42,7 @@
  * @author Jacky Fang 2/02/2005
  * @author Manpreet Minhas
  */
-public interface IMonitoringService {    
+public interface IMonitoringService {
 
     /**
      * Intialise lesson without creating Learning Design copy, i.e. the original LD will be used.
@@ -188,8 +188,7 @@
      * @param userId
      *            checks that the user is a staff member for this lesson
      */
-    void finishLessonOnSchedule(long lessonId, Date endDate, Integer userId)
-	    throws UserAccessDeniedException;
+    void finishLessonOnSchedule(long lessonId, Date endDate, Integer userId) throws UserAccessDeniedException;
 
     /**
      * <P>
@@ -229,6 +228,8 @@
     @SuppressWarnings("rawtypes")
     Activity getActivityById(Long activityId, Class clasz);
 
+    List<GroupingActivity> getGroupingActivitiesByLearningDesignId(Long learningDesignId);
+
     /**
      * Return an activity object based on the requested id.
      *
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
===================================================================
diff -u -r6be225f8d21a7f927da78ca099fc8c3915d7668a -rdbbe9d80bcbeda8f746963fcde183242996fcc68
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	(.../MonitoringService.java)	(revision 6be225f8d21a7f927da78ca099fc8c3915d7668a)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	(.../MonitoringService.java)	(revision dbbe9d80bcbeda8f746963fcde183242996fcc68)
@@ -2007,6 +2007,11 @@
     }
 
     @Override
+    public List<GroupingActivity> getGroupingActivitiesByLearningDesignId(Long learningDesignId) {
+	return activityDAO.getGroupingActivitiesByLearningDesignId(learningDesignId);
+    }
+
+    @Override
     public GroupingActivity getGroupingActivityById(Long activityID) {
 	Activity activity = getActivityById(activityID);
 	if (activity == null) {
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java
===================================================================
diff -u -r7e26cc267b556ce7f7b2116b13a9afe02f353d74 -rdbbe9d80bcbeda8f746963fcde183242996fcc68
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java	(.../MonitoringController.java)	(revision 7e26cc267b556ce7f7b2116b13a9afe02f353d74)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java	(.../MonitoringController.java)	(revision dbbe9d80bcbeda8f746963fcde183242996fcc68)
@@ -1548,10 +1548,10 @@
     @RequestMapping(path = "/isLearningDesignHasGroupings", method = RequestMethod.GET)
     @ResponseBody
     public String isLearningDesignHasGroupings(@RequestParam long learningDesignId) {
-	LearningDesign learningDesign = learningDesignService.getLearningDesign(learningDesignId);
-	for (Activity activity : learningDesign.getActivities()) {
-	    if (activity.isGroupingActivity()
-		    && !((GroupingActivity) activity).getCreateGrouping().isUsedForBranching()) {
+	List<GroupingActivity> groupingActivities = monitoringService
+		.getGroupingActivitiesByLearningDesignId(learningDesignId);
+	for (GroupingActivity activity : groupingActivities) {
+	    if (!activity.getCreateGrouping().isUsedForBranching()) {
 		return Boolean.TRUE.toString();
 	    }
 	}