--- qanda_helper.php.org	2016-08-17 14:47:08.999191959 +0200
+++ qanda_helper.php	2016-08-17 14:45:42.727191959 +0200
@@ -1608,14 +1608,7 @@
     {
         $iRowCount++; $i++;
 
-        if ((!isset($_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$ia[1]]) || $_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$ia[1]] == '') || ($_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$ia[1]] == ' ' ))
-        {
-            $check_ans = CHECKED; //Check the "no answer" radio button if there is no answer in session.
-        }
-        else
-        {
-            $check_ans = '';
-        }
+    	$check_ans = '';
 
         if($iNbCols > 1 && $iRowCount == 1 )
         {
@@ -4606,7 +4599,7 @@
 
             foreach ($labelcode as $ld)
             {
-                $CHECKED     = (isset($_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$myfname]) && $_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$myfname] == $ld)?'CHECKED':'';
+                $CHECKED     = ($ld != "" && isset($_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$myfname]) && $_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$myfname] == $ld)?'CHECKED':'';
                 $answer_tds .= doRender('/survey/questions/arrays/array/no_dropdown/rows/cells/answer_td', array(
                             'myfname'=>$myfname,
                             'ld'=>$ld,
@@ -4640,7 +4633,7 @@
             $no_answer_td = '';
             if ($ia[6] != 'Y' && SHOW_NO_ANSWER == 1)
             {
-                $CHECKED = (!isset($_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$myfname]) || $_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$myfname] == '')?'CHECKED':'';
+		$CHECKED='';
                 $no_answer_td .= doRender('/survey/questions/arrays/array/no_dropdown/rows/cells/answer_td', array(
                             'myfname'                => $myfname,
                             'ld'                     => '',