diff --git a/workflow/engine/classes/class.pmDynaform.php b/workflow/engine/classes/class.pmDynaform.php
index fe2504037..48583af6e 100644
--- a/workflow/engine/classes/class.pmDynaform.php
+++ b/workflow/engine/classes/class.pmDynaform.php
@@ -162,7 +162,7 @@ class pmDynaform
                                 array_push($json->options, $option);
                             }
                         } catch (Exception $e) {
-                            
+
                         }
                     }
                     if (isset($json->options[0])) {
@@ -264,7 +264,7 @@ class pmDynaform
         return $this->record != null && $this->record["DYN_VERSION"] == 2 ? true : false;
     }
 
-    public function printViewWithoutSubmit()
+    public function printTracker()
     {
         ob_clean();
 
diff --git a/workflow/engine/methods/tracker/tracker_Show.php b/workflow/engine/methods/tracker/tracker_Show.php
index 5259a7447..cdebf568d 100755
--- a/workflow/engine/methods/tracker/tracker_Show.php
+++ b/workflow/engine/methods/tracker/tracker_Show.php
@@ -67,7 +67,7 @@ switch ($_GET['CTO_TYPE_OBJ']) {
             $pmDynaForm = new pmDynaform($Fields);
 
             if ($pmDynaForm->isResponsive()) {
-                $pmDynaForm->printViewWithoutSubmit();
+                $pmDynaForm->printTracker();
             }
         } else {
             $G_PUBLISH = new Publisher();
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/MessageEventDefinition.php b/workflow/engine/src/ProcessMaker/BusinessModel/MessageEventDefinition.php
index 11f1d4ab3..9d7c8b8b7 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/MessageEventDefinition.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/MessageEventDefinition.php
@@ -374,12 +374,12 @@ class MessageEventDefinition
                     $arrayData["MSGED_VARIABLES"] = array();
                 }
 
-                $messageEventDefinition->fromArray($arrayData, \BasePeer::TYPE_FIELDNAME);
-
                 if (isset($arrayData["MSGED_VARIABLES"])) {
                     $messageEventDefinition->setMsgedVariables(serialize($arrayData["MSGED_VARIABLES"]));
                 }
 
+                $messageEventDefinition->fromArray($arrayData, \BasePeer::TYPE_FIELDNAME);
+
                 if ($messageEventDefinition->validate()) {
                     $cnn->begin();