diff --git a/sites/all/modules/quiz/quiz.module b/sites/all/modules/quiz/quiz.module
index 8c7a7ee..41099fc 100644
--- a/sites/all/modules/quiz/quiz.module
+++ b/sites/all/modules/quiz/quiz.module
@@ -838,7 +838,7 @@ function quiz_load($node) {
 function quiz_view($node, $teaser = FALSE, $page = FALSE) {
   drupal_alter('quiz_view', $node, $teaser, $page);
   $node = node_prepare($node, $teaser);
-  
+
   // Number of questions is needed on the statistics page.
   $node->number_of_questions = $node->number_of_random_questions + _quiz_get_num_always_questions($node->vid);
 
@@ -1936,6 +1936,18 @@ function quiz_take_quiz($quiz) {
   else {
     drupal_set_title(filter_xss($quiz->title));
     $quiz_end = TRUE;
+    if (isset($_SESSION['quiz_' . $quiz->nid]['feedback']) && $quiz->feedback_time == QUIZ_FEEDBACK_QUESTION) {
+      // $content['body']['question']['#markup'] = drupal_render(drupal_get_form('quiz_question_feedback_finish_form'));
+      // $content['body']['question']['#weight'] = 0;
+      dpm(rawurldecode($_SESSION['quiz_' . $quiz->nid]['feedback']));
+      $content['body']['feedback']['#value'] = rawurldecode($_SESSION['quiz_' . $quiz->nid]['feedback']);
+      $content['body']['feedback']['#weight'] = -100;
+      unset($_SESSION['quiz_' . $quiz->nid]['feedback']);
+    }
+    else {
+      //drupal_set_title($quiz->title);
+      $quiz_end = TRUE;
+    }
   }
   // If we're at the end of the quiz.
   if (!empty($quiz_end)) {