Index: lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsToolService.java
===================================================================
diff -u -r4a144a22d63a90c971cbb07a7079e3b74cf144d2 -rc29ff780a741e2a1014a2d00a1c6f109c57d6d4e
--- lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsToolService.java	(.../ILamsToolService.java)	(revision 4a144a22d63a90c971cbb07a7079e3b74cf144d2)
+++ lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsToolService.java	(.../ILamsToolService.java)	(revision c29ff780a741e2a1014a2d00a1c6f109c57d6d4e)
@@ -89,7 +89,14 @@
     Boolean isGroupedActivity(long toolContentID);
     
     /**
-     * Returns leader's UserId from the nearest Leader Selection Tool, null if none available. 
+     * Returns leader's UserId from the nearest Leader Selection Tool (the nearest to the specified activity) , and null
+     * if no Leader Selection Tools available.
+     * 
+     * @param toolSessionId
+     *            sessionId of the specified activity
+     * @param learnerId
+     *            userId (used to get appropriate Leader Selection Tool's session)
+     * @return
      */
     Long getLeaderUserId(Long toolSessionId, Integer learnerId);
 }
Index: lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java
===================================================================
diff -u -r4a144a22d63a90c971cbb07a7079e3b74cf144d2 -rc29ff780a741e2a1014a2d00a1c6f109c57d6d4e
--- lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java	(.../LamsToolService.java)	(revision 4a144a22d63a90c971cbb07a7079e3b74cf144d2)
+++ lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java	(.../LamsToolService.java)	(revision c29ff780a741e2a1014a2d00a1c6f109c57d6d4e)
@@ -149,8 +149,8 @@
 	Long leaderUserId = null;
 	
 	ToolSession toolSession = this.getToolSession(toolSessionId);
-	ToolActivity mcqActivity = toolSession.getToolActivity();
-	Activity leaderSelectionActivity = getNearestLeaderSelectionActivity(mcqActivity);
+	ToolActivity specifiedActivity = toolSession.getToolActivity();
+	Activity leaderSelectionActivity = getNearestLeaderSelectionActivity(specifiedActivity);
 
 	// check if there is leaderSelectionTool available
 	if (leaderSelectionActivity != null) {