diff --git a/workflow/engine/methods/triggers/triggers_WizardSave.php b/workflow/engine/methods/triggers/triggers_WizardSave.php
index 05655150b..8416ea954 100755
--- a/workflow/engine/methods/triggers/triggers_WizardSave.php
+++ b/workflow/engine/methods/triggers/triggers_WizardSave.php
@@ -63,7 +63,7 @@ foreach ($aInfoFunction as $k => $v) {
         }
         if ($aDataTriggers[$sOptionTrigger] != '') {
 
-            if ((strstr($aDataTriggers[$sOptionTrigger], "@@"))) {
+            if ((strstr($aDataTriggers[$sOptionTrigger], "@@")) || ($aDataTriggers['PMFUNTION_NAME'] == 'evaluateFunction' && $k == 0 && strstr($aDataTriggers[$sOptionTrigger], "@="))) {
                 $option = trim($aDataTriggers[$sOptionTrigger]);
             } else {
 
@@ -81,7 +81,7 @@ foreach ($aInfoFunction as $k => $v) {
                         $option = floatval($aDataTriggers[$sOptionTrigger]);
                         break;
                     default:
-                        $option = (is_numeric($aDataTriggers[$sOptionTrigger]) || is_bool($aDataTriggers[$sOptionTrigger]) ) ? trim($aDataTriggers[$sOptionTrigger]) : (strstr($aDataTriggers[$sOptionTrigger], "'.array.'")) ? trim($aDataTriggers[$sOptionTrigger]) : "'" . trim($aDataTriggers[$sOptionTrigger]) . "'";
+                        $option = (is_numeric($aDataTriggers[$sOptionTrigger]) || is_bool($aDataTriggers[$sOptionTrigger]) ) ? trim($aDataTriggers[$sOptionTrigger]) : (strstr($aDataTriggers[$sOptionTrigger], "'.array.'")) ? trim($aDataTriggers[$sOptionTrigger]) : '"' . trim($aDataTriggers[$sOptionTrigger]) . '"';
                         break;
                 }
             }
diff --git a/workflow/engine/methods/triggers/triggers_WizardUpdate.php b/workflow/engine/methods/triggers/triggers_WizardUpdate.php
index 33c545186..0d4799373 100755
--- a/workflow/engine/methods/triggers/triggers_WizardUpdate.php
+++ b/workflow/engine/methods/triggers/triggers_WizardUpdate.php
@@ -66,7 +66,7 @@ foreach ($aInfoFunction as $k => $v) {
         }
         if ($aDataTriggers[$sOptionTrigger] != '') {
 
-            if ((strstr($aDataTriggers[$sOptionTrigger], "@@"))) {
+            if ((strstr($aDataTriggers[$sOptionTrigger], "@@")) || ($aDataTriggers['PMFUNTION_NAME'] == 'evaluateFunction' && $k == 0 && strstr($aDataTriggers[$sOptionTrigger], "@="))) {
                 $option = $aDataTriggers[$sOptionTrigger];
             } else {
 
@@ -84,7 +84,7 @@ foreach ($aInfoFunction as $k => $v) {
                         $option = floatval($aDataTriggers[$sOptionTrigger]);
                         break;
                     default:
-                        $option = (is_numeric($aDataTriggers[$sOptionTrigger]) || is_bool($aDataTriggers[$sOptionTrigger]) ) ? trim($aDataTriggers[$sOptionTrigger]) : (strstr($aDataTriggers[$sOptionTrigger], "array")) ? trim($aDataTriggers[$sOptionTrigger]) : "'" . trim($aDataTriggers[$sOptionTrigger]) . "'";
+                        $option = (is_numeric($aDataTriggers[$sOptionTrigger]) || is_bool($aDataTriggers[$sOptionTrigger]) ) ? trim($aDataTriggers[$sOptionTrigger]) : (strstr($aDataTriggers[$sOptionTrigger], "array")) ? trim($aDataTriggers[$sOptionTrigger]) : '"' . trim($aDataTriggers[$sOptionTrigger]) . '"';
                         break;
                 }
             }