diff --git a/anatomy/views.py b/anatomy/views.py
index ee166853..00fc8081 100644
--- a/anatomy/views.py
+++ b/anatomy/views.py
@@ -508,11 +508,9 @@ def exam_scores_cid(request, pk):
                 continue
 
             ans = s[0].answer
-            if ans.lower() in q.answers.all().values_list(Lower("answer"),
-                                                          flat=True):
+            if q.answers.filter(answer__iexact=ans, status=Answer.MarkOptions.CORRECT).first() is not None:
                 a = 2
-            elif ans.lower() in q.half_mark_answers.all().values_list(
-                    Lower("answer"), flat=True):
+            elif q.answers.filter(answer__iexact=ans, status=Answer.MarkOptions.HALF_MARK).first() is not None:
                 a = 1
             else:
                 a = 0