diff --git a/question/type/numerical/display.html b/question/type/numerical/display.html
index 139b0de85ec..75de020abb6 100644
--- a/question/type/numerical/display.html
+++ b/question/type/numerical/display.html
@@ -61,8 +61,18 @@
         $class = '';
         $feedbackimgunit = '';
         if ($options->feedback){
-            $classunit = question_get_feedback_class(1-$this->raw_unitpenalty);
-            $feedbackimgunit = question_get_feedback_image(1-$this->raw_unitpenalty, $options->feedback);
+            $classunitvalue = 0 ;
+            if ( isset($state->responses['unit']) && $state->responses['unit']!='' && count( $question->options->units) > 0){//&& isset($question->options->units['0'])
+                foreach($question->options->units as $key => $unitv){
+                    if ($unitv->unit == trim($state->responses['unit'])){
+                      $classunitvalue = 1 ;
+                    //  break ;
+                    }  
+                }
+            }
+           // $classunitvalue = 0 ;
+            $classunit = question_get_feedback_class($classunitvalue); //1-$this->raw_unitpenalty
+            $feedbackimgunit = question_get_feedback_image($classunitvalue, $options->feedback);
         }
         if ($question->options->showunits == 3 || (isset($question->options->units) && count($question->options->units) == 0 )) {// no unit display or tested