diff --git a/workflow/engine/classes/class.pmScript.php b/workflow/engine/classes/class.pmScript.php
index 87c4b7ddf..a6f494f5d 100644
--- a/workflow/engine/classes/class.pmScript.php
+++ b/workflow/engine/classes/class.pmScript.php
@@ -206,6 +206,7 @@ class PMScript
         set_error_handler( 'handleErrors' );
         $_SESSION['_CODE_'] = $sCode;
         eval( $sScript );
+        $this->evaluateVariable();
         unset( $_SESSION['_CODE_'] );
         ob_end_flush();
     }
@@ -507,6 +508,67 @@ class PMScript
         }
         return $bResult;
     }
+    
+    Public function evaluateVariable ()
+    {
+        $process = new Process();
+        if(!$process->isBpmnProcess($_SESSION['PROCESS'])) {
+            return;
+        }
+        require_once PATH_CORE.'controllers/pmTablesProxy.php';
+        $pmTablesProxy = new pmTablesProxy();
+        $variableModule = new ProcessMaker\BusinessModel\Variable();
+        $searchTypes = array ('checkgroup','dropdown','suggest');
+        $processVariables = $pmTablesProxy->getDynaformVariables($_SESSION['PROCESS'],$searchTypes,false);
+        $variables = $this->affected_fields;
+        $variables = array_unique($variables);
+        $newFields = array();
+        $arrayValues = array();
+        $arrayLabels = array();
+        if(is_array($variables) && is_array($processVariables)) {
+            foreach($variables as $var) {
+                if(strpos($var, '_label') === false) {
+                    if(in_array($var,$processVariables)) {
+                        if(isset($this->aFields[$var]) && is_array($this->aFields[$var][1]) ) {
+                            $varLabel = $var.'_label';   
+                            $arrayValue = $this->aFields[$var];
+                            if(is_array($arrayValue) && sizeof($arrayValue)) {
+                                foreach($arrayValue as $val) {
+                                    if(is_array($val)){
+                                        $val = array_values($val);
+                                        $arrayValues[] = $val[0];
+                                        $arrayLabels[] = $val[1];
+                                    }
+                                }
+                                if(sizeof($arrayLabels)) {
+                                    $varInfo = $variableModule->getVariableTypeByName($_SESSION['PROCESS'],$var);
+                                    if(is_array($varInfo) && sizeof($varInfo)) {
+                                        $varType = $varInfo['VAR_FIELD_TYPE'];
+                                        switch($varType) {
+                                            case 'array':
+                                                $arrayLabels = '["'.implode('","',$arrayLabels).'"]'; 
+                                                $newFields[$var] = $arrayValues;
+                                                $newFields[$varLabel] = $arrayLabels;
+                                            break;
+                                            case 'string':
+                                                $newFields[$var] = $arrayValues[0];
+                                                $newFields[$varLabel] = $arrayLabels[0];
+                                            break;
+                                        }
+                                        $this->affected_fields[] = $varLabel; 
+                                        $this->aFields = array_merge($this->aFields,$newFields);
+                                        unset($newFields);
+                                        unset($arrayValues);
+                                        unset($arrayLabels);
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }            
+        }
+    }
 }
 
 //Start - Private functions
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Variable.php b/workflow/engine/src/ProcessMaker/BusinessModel/Variable.php
index e2028fc55..e85a99638 100755
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Variable.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Variable.php
@@ -872,5 +872,26 @@ class Variable
             return $sCall;
         }
     }
+    
+    public function getVariableTypeByName($processUid, $variableName)
+    {
+        try {
+            $criteria = new \Criteria("workflow");
+            $criteria->addSelectColumn(\ProcessVariablesPeer::VAR_UID);
+            $criteria->addSelectColumn(\ProcessVariablesPeer::VAR_NAME);
+            $criteria->addSelectColumn(\ProcessVariablesPeer::VAR_FIELD_TYPE);
+            $criteria->add(\ProcessVariablesPeer::VAR_NAME, $variableName);
+            $criteria->add(\ProcessVariablesPeer::PRJ_UID, $processUid);
+            $rsCriteria = \ProcessVariablesPeer::doSelectRS($criteria);
+            $rsCriteria->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
+            if ($rsCriteria->next()) {
+                $row = $rsCriteria->getRow();
+                return sizeof($row) ? $row : false;
+            }
+            return false;
+        } catch (\Exception $e) {
+            throw $e;
+        }
+    }
 
 }
\ No newline at end of file