diff --git a/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php b/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php
index eee0bf7b2..61f45383e 100644
--- a/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php
+++ b/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php
@@ -229,14 +229,14 @@ class BpmnWorkflow extends Project\Bpmn
 
                         // update case scheduler
                         if ($event && $event->getEvnType() == "START" && $event->getEvnMarker() == "TIMER") {
-                            $aData = array('TAS_UID'=>$data["FLO_ELEMENT_DEST"], 'SCH_UID'=>$data["FLO_ELEMENT_ORIGIN"]);
-                            $this->wp->updateCaseScheduler($aData);
+                            $caseSchedulerData = array('TAS_UID'=>$data["FLO_ELEMENT_DEST"]);
+                            $this->wp->updateCaseScheduler($data["FLO_ELEMENT_ORIGIN"], $caseSchedulerData);
                         }
 
                         // update web entry
                         if ($event && $event->getEvnType() == "START" && $event->getEvnMarker() == "MESSAGE") {
-                            $aData = array('TAS_UID'=>$data["FLO_ELEMENT_DEST"], 'WE_UID'=>$data["FLO_ELEMENT_ORIGIN"]);
-                            $this->wp->updateWebEntry($aData);
+                            $webEntryData = array('TAS_UID'=>$data["FLO_ELEMENT_DEST"]);
+                            $this->wp->updateWebEntry($data["FLO_ELEMENT_ORIGIN"], $webEntryData);
                         }
                         break;
                 }
@@ -286,20 +286,14 @@ class BpmnWorkflow extends Project\Bpmn
 
             // update case scheduler
             if (! is_null($event) && $event->getEvnType() == "START" && $event->getEvnMarker() == "TIMER") {
-                $aData = array(
-                    'TAS_UID'=>'',
-                    'SCH_UID'=>$flow->getFloElementOrigin()
-                );
-                $this->wp->updateCaseScheduler($aData);
+                $caseSchedulerData = array( 'TAS_UID'=>'' );
+                $this->wp->updateCaseScheduler($flow->getFloElementOrigin(), $caseSchedulerData);
             }
 
             // update web entry
             if (! is_null($event) && $event->getEvnType() == "START" && $event->getEvnMarker() == "MESSAGE") {
-                $aData = array(
-                    'TAS_UID'=>'',
-                    'WE_UID'=>$flow->getFloElementOrigin()
-                );
-                $this->wp->updateWebEntry($aData);
+                $webEntryData = array( 'TAS_UID'=>'' );
+                $this->wp->updateWebEntry($flow->getFloElementOrigin(), $webEntryData);
             }
 
         } elseif ($flow->getFloElementOriginType() == "bpmnActivity" &&
diff --git a/workflow/engine/src/ProcessMaker/Project/Workflow.php b/workflow/engine/src/ProcessMaker/Project/Workflow.php
index c484b07c5..d82606c91 100644
--- a/workflow/engine/src/ProcessMaker/Project/Workflow.php
+++ b/workflow/engine/src/ProcessMaker/Project/Workflow.php
@@ -829,9 +829,10 @@ class Workflow extends Handler
         }
     }
 
-    public function updateCaseScheduler($data)
+    public function updateCaseScheduler($schUid, $data)
     {
         try {
+            $data = array_merge(array("SCH_UID" => $schUid), $data);
             $caseScheduler = new \CaseScheduler();
             $caseScheduler->update($data);
             self::log("Update Case Scheduler Success!");
@@ -873,10 +874,9 @@ class Workflow extends Handler
         }
     }
 
-    public function updateWebEntry($data)
+    public function updateWebEntry($webEntryUid, $data)
     {
         try {
-            $webEntryUid = $data['WE_UID'];
             $webEntry = \WebEntryPeer::retrieveByPK($webEntryUid);
             $webEntry->fromArray($data, \BasePeer::TYPE_FIELDNAME);
             $webEntry->save();