diff --git a/workflow/engine/methods/triggers/triggers_WizardSave.php b/workflow/engine/methods/triggers/triggers_WizardSave.php
index 5018bc8eb..95b5078db 100755
--- a/workflow/engine/methods/triggers/triggers_WizardSave.php
+++ b/workflow/engine/methods/triggers/triggers_WizardSave.php
@@ -62,10 +62,11 @@ foreach ( $aInfoFunction as $k => $v ) {
 		if ($aDataTriggers [$sOptionTrigger] != '') {
 			
 			if ((strstr ( $aDataTriggers [$sOptionTrigger], "@@" ))) {
-				$option = trim($aDataTriggers [$sOptionTrigger]);
+			  $option = trim($aDataTriggers [$sOptionTrigger]);
 			} else {
-        $aDataTriggers [$sOptionTrigger] = str_replace("'", "\'", $aDataTriggers [$sOptionTrigger]);
-        $option = "'" . trim($aDataTriggers [$sOptionTrigger]) . "'";
+                        $aDataTriggers [$sOptionTrigger] = str_replace("'", "\'", $aDataTriggers [$sOptionTrigger]);
+                        $option = (is_numeric($aDataTriggers [$sOptionTrigger]))?trim($aDataTriggers [$sOptionTrigger]):
+                        (strstr($aDataTriggers [$sOptionTrigger],"array") )?trim($aDataTriggers [$sOptionTrigger]):"'" . trim($aDataTriggers [$sOptionTrigger]) . "'";
 			}
 		} else {
 			$option = "''";
diff --git a/workflow/engine/methods/triggers/triggers_WizardUpdate.php b/workflow/engine/methods/triggers/triggers_WizardUpdate.php
index 3200f3c87..f02be57ef 100755
--- a/workflow/engine/methods/triggers/triggers_WizardUpdate.php
+++ b/workflow/engine/methods/triggers/triggers_WizardUpdate.php
@@ -65,9 +65,11 @@ foreach ( $aInfoFunction as $k => $v ) {
 		if ($aDataTriggers [$sOptionTrigger] != '') {
 
 			if ((strstr ( $aDataTriggers [$sOptionTrigger], "@@" ))) {
-				$option = $aDataTriggers [$sOptionTrigger];
+			  $option = $aDataTriggers [$sOptionTrigger];
 			} else {
-				$option = "'" . $aDataTriggers [$sOptionTrigger] . "'";
+                        $aDataTriggers [$sOptionTrigger] = str_replace("'", "\'", $aDataTriggers [$sOptionTrigger]);
+                        $option = (is_numeric($aDataTriggers [$sOptionTrigger]))?trim($aDataTriggers [$sOptionTrigger]):
+                      (strstr($aDataTriggers [$sOptionTrigger],"array") )?trim($aDataTriggers [$sOptionTrigger]):"'" . trim($aDataTriggers [$sOptionTrigger]) . "'";
 			}
 		} else {
 			$option = "' '";
@@ -77,6 +79,7 @@ foreach ( $aInfoFunction as $k => $v ) {
 	}
 
 }
+
 $sPMfunction .= (isset ( $aDataTriggers ['TRI_ANSWER'] ) && $aDataTriggers ['TRI_ANSWER'] != '') ? $aDataTriggers ['TRI_ANSWER'] . " = " : "";
 $sPMfunction .= $aDataTriggers ['PMFUNTION_NAME'] . " (" . implode ( ",", $methodParamsFinal ) . ");";
 
@@ -97,4 +100,4 @@ $oTrigger->update ( $aDataTriggers );
 
 //Update Trigger Array
 $oProcessMap->triggersList($aDataTriggers['PRO_UID']);
-?>
\ No newline at end of file
+?>