diff --git a/anatomy/templates/anatomy/exam_scores.html b/anatomy/templates/anatomy/exam_scores.html
index 26cd2f6e..b6ad85f2 100644
--- a/anatomy/templates/anatomy/exam_scores.html
+++ b/anatomy/templates/anatomy/exam_scores.html
@@ -6,8 +6,8 @@
 
     {% if unmarked %}
     The following questions need marking
-    {% for question in unmarked %}
-    <a href="{% url 'anatomy:mark' exam.pk question.pk %}">{{ exam|get_question_index:question }}</a>
+    {% for question, exam_index in unmarked %}
+    <a href="{% url 'anatomy:mark' exam.pk exam_index %}">{{ exam_index }}</a>
     {% endfor %}
 
     {% endif %}
diff --git a/anatomy/views.py b/anatomy/views.py
index c56ae6a8..4c3d4c71 100644
--- a/anatomy/views.py
+++ b/anatomy/views.py
@@ -595,7 +595,7 @@ def exam_scores_cid(request, pk):
             ans = s.answer
             answer_score = s.get_answer_score()
             if answer_score == "unmarked":
-                unmarked.add(q)
+                unmarked.add((q, exam.get_question_index(q))
             user_answers[cid].append(ans)
             user_answers_marks[cid].append(answer_score)
             user_answers_and_marks[cid].append((ans, answer_score))