Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/IImageGalleryService.java
===================================================================
diff -u -r7dac65b89adddab2b602b5d57d8e3ddd4cab2060 -r953959b3397353c5c4364c33582c8ecbcb6be800
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/IImageGalleryService.java	(.../IImageGalleryService.java)	(revision 7dac65b89adddab2b602b5d57d8e3ddd4cab2060)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/IImageGalleryService.java	(.../IImageGalleryService.java)	(revision 953959b3397353c5c4364c33582c8ecbcb6be800)
@@ -106,7 +106,7 @@
      * @param sessionId
      * @return
      */
-    ImageGalleryUser getUserByIDAndSession(Long long1, Long sessionId);
+    ImageGalleryUser getUserByIDAndSession(Long userId, Long sessionId);
 
     // ********** Repository methods ***********************
     /**
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryOutputFactory.java
===================================================================
diff -u -r3a1cbcfc06aaf55285140e18e4336ca65db9e255 -r953959b3397353c5c4364c33582c8ecbcb6be800
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryOutputFactory.java	(.../ImageGalleryOutputFactory.java)	(revision 3a1cbcfc06aaf55285140e18e4336ca65db9e255)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryOutputFactory.java	(.../ImageGalleryOutputFactory.java)	(revision 953959b3397353c5c4364c33582c8ecbcb6be800)
@@ -23,6 +23,7 @@
 /* $Id$ */
 package org.lamsfoundation.lams.tool.imageGallery.service;
 
+import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 import java.util.SortedMap;
@@ -71,7 +72,7 @@
 	ImageGallerySession session = imageGalleryService.getImageGallerySessionBySessionId(toolSessionId);
 	if (session != null) {
 
-	    ImageGalleryUser user = imageGalleryService.getUserByIDAndSession(learnerId, session.getUid());
+	    ImageGalleryUser user = imageGalleryService.getUserByIDAndSession(learnerId, toolSessionId);
 
 	    if (names == null || names.contains(OUTPUT_NAME_LEARNER_NUM_IMAGES_UPLOADED)) {
 		output.put(OUTPUT_NAME_LEARNER_NUM_IMAGES_UPLOADED, getNumUploadedImages(user, session));
@@ -92,7 +93,7 @@
 	    ImageGallerySession session = imageGalleryService.getImageGallerySessionBySessionId(toolSessionId);
 	    if (session != null) {
 
-		ImageGalleryUser user = imageGalleryService.getUserByIDAndSession(learnerId, session.getUid());
+		ImageGalleryUser user = imageGalleryService.getUserByIDAndSession(learnerId, toolSessionId);
 
 		if (name.equals(OUTPUT_NAME_LEARNER_NUM_IMAGES_UPLOADED)) {
 		    return getNumUploadedImages(user, session);
@@ -138,7 +139,9 @@
 	int countComments = 0;
 	if (user != null) {
 	    Set<ImageGalleryItem> allImages = imageGallery.getImageGalleryItems();
-	    for (ImageGalleryItem image : allImages) {
+	    Iterator<ImageGalleryItem> it = allImages.iterator();
+	    while(it.hasNext()) {
+		ImageGalleryItem image = it.next();
 		Set<ImageComment> imageComments = image.getComments();
 		for (ImageComment comment : imageComments) {
 		    if (user.getUserId().equals(comment.getCreateBy().getUserId())) {