diff --git a/gulliver/system/class.g.php b/gulliver/system/class.g.php
index 76d26c68f..8b87c6a9b 100644
--- a/gulliver/system/class.g.php
+++ b/gulliver/system/class.g.php
@@ -1866,8 +1866,7 @@ $output = $outputHeader.$output;
     $__textoEval = "";
     $u           = 0;
     //$count=preg_match_all('/\@(?:([\@\%\#\!Qq])([a-zA-Z\_]\w*)|([a-zA-Z\_][\w\-\>\:]*)\(((?:[^\\\\\)]*(?:[\\\\][\w\W])?)*)\))/',$sqlString,$match,PREG_PATTERN_ORDER | PREG_OFFSET_CAPTURE);
-    $count = preg_match_all('/\@(?:([\@\%\#\!Qq])([a-zA-Z\_]\w*)|([a-zA-Z\_][\w\-\>\:]*)\(((?:[^\\\\\)]*?)*)\))/',$sqlString,$match,PREG_PATTERN_ORDER | PREG_OFFSET_CAPTURE);
-
+    $count = preg_match_all('/\@(?:([\@\%\#\=\!Qq])([a-zA-Z\_]\w*)|([a-zA-Z\_][\w\-\>\:]*)\(((?:[^\\\\\)]*?)*)\))/',$sqlString,$match,PREG_PATTERN_ORDER | PREG_OFFSET_CAPTURE);
     if ($count) {
       for($r=0;$r<$count;$r++) {
         if (!isset($result[$match[2][$r][0]]))
@@ -1903,6 +1902,10 @@ $output = $outputHeader.$output;
           if (($match[1][$r][0]=='#')&&(isset($result[$match[2][$r][0]]))) {
             $__textoEval.=G::replaceDataField($result[$match[2][$r][0]],$result);continue;
           }
+          //Non-quoted =
+          if (($match[1][$r][0]=='=')&&(isset($result[$match[2][$r][0]]))) {
+            $__textoEval.=G::replaceDataField($result[$match[2][$r][0]],$result);continue;
+          }
         }
       }
     }