Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dao/hibernate/GradebookDAO.java
===================================================================
diff -u -r725d88237bd16a01a5ec759f45dba18a00ab340f -rfdf5059c1085cc87acd4a4f3894ed29b18e7b2f9
--- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dao/hibernate/GradebookDAO.java	(.../GradebookDAO.java)	(revision 725d88237bd16a01a5ec759f45dba18a00ab340f)
+++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dao/hibernate/GradebookDAO.java	(.../GradebookDAO.java)	(revision fdf5059c1085cc87acd4a4f3894ed29b18e7b2f9)
@@ -312,9 +312,9 @@
 		+ sortOrder;
 
 	final String CONDITION_IF_ANY_USER_PROVIDED = " AND lesson.lessonClass.groupingId = g.grouping.groupingId "
-		+ "AND ug.groupId = g.groupId AND ug.userId = :userId ";
+		+ "AND ug.group.groupId = g.groupId AND ug.user.userId = :userId ";
 
-	final String CONDITION_IF_STAFF_PROVIDED = " AND ug.groupId = lesson.lessonClass.staffGroup.groupId AND ug.userId = :userId ";
+	final String CONDITION_IF_STAFF_PROVIDED = " AND ug.group.groupId = lesson.lessonClass.staffGroup.groupId AND ug.user.userId = :userId ";
 
 	String queryString;
 	if (sortBy.equals("avgTimeTaken")) {