diff --git a/question/type/ordering/renderer.php b/question/type/ordering/renderer.php
index 317098ff7d1..71dea54afab 100644
--- a/question/type/ordering/renderer.php
+++ b/question/type/ordering/renderer.php
@@ -83,36 +83,48 @@ class qtype_ordering_renderer extends qtype_with_combined_feedback_renderer {
 
         $result .= html_writer::tag('div', $question->format_questiontext($qa), array('class' => 'qtext'));
 
+        $printeditems = false;
         if (count($currentresponse)) {
-            $result .= html_writer::start_tag('div', array('class' => 'ablock'));
-            $result .= html_writer::start_tag('div', array('class' => 'answer'));
-            $result .= html_writer::start_tag('ul',  array('class' => 'sortablelist', 'id' => $sortable_id));
 
             // generate ordering items
             foreach ($currentresponse as $position => $answerid) {
-                if (array_key_exists($answerid, $question->answers)) {
-                    if ($options->correctness) {
-                        if ($correctresponse[$position]==$answerid) {
-                            $class = 'correctposition';
-                            $img = $this->feedback_image(1);
-                        } else {
-                            $class = 'wrongposition';
-                            $img = $this->feedback_image(0);
-                        }
-                        $img = "$img ";
-                    } else {
-                        $class = 'sortableitem';
-                        $img = '';
-                    }
-                    // the original "id" revealed the correct order of the answers
-                    // because $answer->fraction holds the correct order number
-                    // $id = 'ordering_item_'.$answerid.'_'.intval($question->answers[$answerid]->fraction);
-                    $answer = $question->answers[$answerid];
-                    $params = array('class' => $class, 'id' => $answer->md5key);
-                    $result .= html_writer::tag('li', $img.$answer->answer, $params);
+                if (! array_key_exists($answerid, $question->answers)) {
+                    continue; // shouldn't happen !!
+                }
+                if (! array_key_exists($position, $correctresponse)) {
+                    continue; // shouldn't happen !!
                 }
-            }
 
+                if ($printeditems==false) {
+                    $printeditems = true;
+                    $result .= html_writer::start_tag('div', array('class' => 'ablock'));
+                    $result .= html_writer::start_tag('div', array('class' => 'answer'));
+                    $result .= html_writer::start_tag('ul',  array('class' => 'sortablelist', 'id' => $sortable_id));
+                }
+
+                if ($options->correctness) {
+                    if ($correctresponse[$position]==$answerid) {
+                        $class = 'correctposition';
+                        $img = $this->feedback_image(1);
+                    } else {
+                        $class = 'wrongposition';
+                        $img = $this->feedback_image(0);
+                    }
+                    $img = "$img ";
+                } else {
+                    $class = 'sortableitem';
+                    $img = '';
+                }
+                // the original "id" revealed the correct order of the answers
+                // because $answer->fraction holds the correct order number
+                // $id = 'ordering_item_'.$answerid.'_'.intval($question->answers[$answerid]->fraction);
+                $answer = $question->answers[$answerid];
+                $params = array('class' => $class, 'id' => $answer->md5key);
+                $result .= html_writer::tag('li', $img.$answer->answer, $params);
+            }
+        }
+
+        if ($printeditems) {
             $result .= html_writer::end_tag('ul');
             $result .= html_writer::end_tag('div'); // answer
             $result .= html_writer::end_tag('div'); // ablock
@@ -137,28 +149,27 @@ class qtype_ordering_renderer extends qtype_with_combined_feedback_renderer {
         $output = '';
 
         $showcorrect = false;
-        if ($step = $qa->get_last_step()) {
-            switch ($step->get_state()) {
-                case 'gradedright'  : $showcorrect = false; break;
-                case 'gradedpartial': $showcorrect = true;  break;
-                case 'gradedwrong'  : $showcorrect = true;  break;
+        $question = $qa->get_question();
+        if (empty($question->correctresponse)) {
+            $output .= html_writer::tag('p', get_string('noresponsedetails', 'qtype_ordering'));
+        } else {
+            if ($step = $qa->get_last_step()) {
+                switch ($step->get_state()) {
+                    case 'gradedright'  : $showcorrect = false; break;
+                    case 'gradedpartial': $showcorrect = true;  break;
+                    case 'gradedwrong'  : $showcorrect = true;  break;
+                }
             }
         }
-
         if ($showcorrect) {
-            $question = $qa->get_question();
-            if (empty($question->correctresponse)) {
-                $output .= html_writer::tag('p', get_string('noresponsedetails', 'qtype_ordering'));
-            } else {
-                $output .= html_writer::tag('p', get_string('correctorder', 'qtype_ordering'));
-                $output .= html_writer::start_tag('ol');
-                $correctresponse = $question->correctresponse;
-                foreach ($correctresponse as $position => $answerid) {
-                    $answer = $question->answers[$answerid];
-                    $output .= html_writer::tag('li', $answer->answer);
-                }
-                $output .= html_writer::end_tag('ol');
+            $output .= html_writer::tag('p', get_string('correctorder', 'qtype_ordering'));
+            $output .= html_writer::start_tag('ol');
+            $correctresponse = $question->correctresponse;
+            foreach ($correctresponse as $position => $answerid) {
+                $answer = $question->answers[$answerid];
+                $output .= html_writer::tag('li', $answer->answer);
             }
+            $output .= html_writer::end_tag('ol');
         }
 
         return $output;
diff --git a/question/type/ordering/version.php b/question/type/ordering/version.php
index b21a9e5b515..4f5be50db08 100644
--- a/question/type/ordering/version.php
+++ b/question/type/ordering/version.php
@@ -30,6 +30,6 @@ defined('MOODLE_INTERNAL') || die();
 $plugin->cron      = 0;
 $plugin->component = 'qtype_ordering';
 $plugin->maturity  = MATURITY_STABLE; // ALPHA=50, BETA=100, RC=150, STABLE=200
-$plugin->release   = '2015-01-24 (17)';
-$plugin->version   = 2015012417;
+$plugin->release   = '2015-01-30 (18)';
+$plugin->version   = 2015013018;
 $plugin->requires  = 2010112400; // Moodle 2.0