diff --git a/question_types/short_answer/short_answer.classes.inc b/question_types/short_answer/short_answer.classes.inc
index 64df33b..13f857a 100644
--- a/question_types/short_answer/short_answer.classes.inc
+++ b/question_types/short_answer/short_answer.classes.inc
@@ -440,11 +440,10 @@ class ShortAnswerResponse extends QuizQuestionResponse {
     $data[] = array(
       'choice' => '',
       'attempt' => $this->answer,
-      'correct' => !$this->evaluated ? t('This answer has not yet been scored.') : '',
-      'score' => $this->getScore(),
+      'correct' => $this->question->answers[0]['is_correct'] ? quiz_icon('correct') : quiz_icon(''),
+      'score' => !$this->evaluated ? t('This answer has not yet been scored.') : $this->getScore(),
       'answer_feedback' => check_markup($this->answer_feedback, $this->answer_feedback_format),
-      'question_feedback' => '',
-      'solution' => '',
+      'solution' => $this->question->correct_answer,
     );
 
     return $data;