Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentQuestionResultDAOHibernate.java
===================================================================
diff -u -r7509e377936c9e3baf8e039cf65ce89d1b0d7285 -ra1f52c2b9b099b7f138ea59762e3f86147700f85
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentQuestionResultDAOHibernate.java	(.../AssessmentQuestionResultDAOHibernate.java)	(revision 7509e377936c9e3baf8e039cf65ce89d1b0d7285)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentQuestionResultDAOHibernate.java	(.../AssessmentQuestionResultDAOHibernate.java)	(revision a1f52c2b9b099b7f138ea59762e3f86147700f85)
@@ -46,7 +46,7 @@
 	    + " AS q, "
 	    + AssessmentResult.class.getName()
 	    + " AS r "
-	    + " WHERE q.assessmentResult.uid = r.uid AND r.assessment.uid = ? AND r.user.userId =? AND q.assessmentQuestion.uid =? AND q.mark < q.assessmentQuestion.defaultGrade AND (r.finishDate != null)";
+	    + " WHERE q.assessmentResult.uid = r.uid AND r.assessment.uid = ? AND r.user.userId =? AND q.assessmentQuestion.uid =? AND (ROUND(q.mark + q.penalty) < q.maxMark) AND (r.finishDate != null)";
     
     private static final String GET_ANSWER_MARK = "SELECT q.mark FROM  "
 	    + AssessmentQuestionResult.class.getName()