diff --git a/common_functions.php b/common_functions.php
index ad30c7ff362..3f3b6ccb001 100644
--- a/common_functions.php
+++ b/common_functions.php
@@ -5929,6 +5929,10 @@ function retrieve_Answer($code, $phpdateformat=null)
         if ($questiondetails['type'] == "M" ||
         $questiondetails['type'] == "P")
         {
+            if (strpos($code,'comment')>0 && isset($_SESSION[$code]))
+            {
+                return $_SESSION[$code];
+            }
             $query="SELECT * FROM {$dbprefix}questions WHERE parent_qid='".$questiondetails['qid']."' AND language='".$_SESSION['s_lang']."'";
             $result=db_execute_assoc($query) or safe_die("Error getting answer<br />$query<br />".$connect->ErrorMsg());  //Checked
             while($row=$result->FetchRow())