Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentQuestionResultDAOHibernate.java
===================================================================
diff -u -r4b2ee37c3271b4bbfd17604063031fff036ade22 -r1803940d4b4ae2d25b8ae9fe5ded7dc93c2f6071
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentQuestionResultDAOHibernate.java	(.../AssessmentQuestionResultDAOHibernate.java)	(revision 4b2ee37c3271b4bbfd17604063031fff036ade22)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentQuestionResultDAOHibernate.java	(.../AssessmentQuestionResultDAOHibernate.java)	(revision 1803940d4b4ae2d25b8ae9fe5ded7dc93c2f6071)
@@ -50,7 +50,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";
+			+ " 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()