diff --git a/physics/models.py b/physics/models.py
index 11f87819..87028fc7 100644
--- a/physics/models.py
+++ b/physics/models.py
@@ -129,6 +129,15 @@ class Question(QuestionBase):
     def get_questions(self):
         return [self.a, self.b, self.c, self.d, self.e]
 
+    def get_questions_and_answers_and_feedback(self):
+        return [
+            (self.a, self.a_answer, self.a_feedback),
+            (self.b, self.b_answer, self.b_feedback),
+            (self.c, self.c_answer, self.c_feedback),
+            (self.d, self.d_answer, self.d_feedback),
+            (self.e, self.e_answer, self.e_feedback),
+        ]
+
     def get_unanswered_mark_and_text(self) -> tuple[int, tuple[str, str, str, str, str]]:
         """
 
diff --git a/physics/templates/physics/partials/exam_review_question_fragment.html b/physics/templates/physics/partials/exam_review_question_fragment.html
index 3a7f0503..ce50c218 100644
--- a/physics/templates/physics/partials/exam_review_question_fragment.html
+++ b/physics/templates/physics/partials/exam_review_question_fragment.html
@@ -7,21 +7,15 @@
             <h6>Parts</h6>
             <ul class="list-group">
                 {% if question.get_questions %}
-                    {% for part in question.get_questions %}
+                    {% for question, answer, feedback in question.get_questions_and_answers_and_feedback %}
                         <li class="list-group-item d-flex justify-content-between align-items-start">
                             <div>
                                 <strong>Part {{ forloop.counter }}.</strong>
-                                <span class="ms-2">{{ part }}</span>
+                                <span class="ms-2">{{ question }}</span>
                             </div>
                             <div>
-                                {# If we can determine the correct answer for this part show a badge - best-effort #}
-                                {% if question.get_answers %}
-                                    {% with ans=question.get_answers|get_item:forloop.counter0 %}
-                                        {% if ans %}
-                                            <span class="badge bg-primary">Answer: {{ ans }}</span>
-                                        {% endif %}
-                                    {% endwith %}
-                                {% endif %}
+                                <span class="badge bg-primary">Answer: {{ answer }}</span>
+                                <span class="ms-2">{{ feedback }}</span>
                             </div>
                         </li>
                     {% endfor %}