diff --git a/workflow/engine/classes/model/AppDelegation.php b/workflow/engine/classes/model/AppDelegation.php
index 7feeaa1df..abb930c01 100644
--- a/workflow/engine/classes/model/AppDelegation.php
+++ b/workflow/engine/classes/model/AppDelegation.php
@@ -442,6 +442,7 @@ class AppDelegation extends BaseAppDelegation
         //Get Task properties
         $task = TaskPeer::retrieveByPK( $this->getTasUid() );
 
+        $aData = array();
         $aData['TAS_UID'] = $this->getTasUid();
         //Added to allow User defined Timing Control at Run time from Derivation screen
         if (isset( $sNextTasParam['NEXT_TASK']['TAS_TRANSFER_HIDDEN_FLY'] ) && $sNextTasParam['NEXT_TASK']['TAS_TRANSFER_HIDDEN_FLY'] == 'true') {
@@ -471,7 +472,7 @@ class AppDelegation extends BaseAppDelegation
         //Calendar - Use the dates class to calculate dates
         $calendar = new calendar();
 
-        $arrayCalendarData = array();
+        $arrayCalendarData = $calendar->getCalendarData($aCalendarUID);
 
         if ($calendar->pmCalendarUid == "") {
             $calendar->getCalendar(null, $this->getProUid(), $this->getTasUid());
@@ -480,11 +481,11 @@ class AppDelegation extends BaseAppDelegation
         }
 
         //Due date
-        /*$iDueDate = $calendar->calculateDate( $this->getDelDelegateDate(), $aData['TAS_DURATION'], $aData['TAS_TIMEUNIT']         //hours or days, ( we only accept this two types or maybe weeks
-        );*/
-        $dueDate = $calendar->dashCalculateDate($this->getDelDelegateDate(), $aData["TAS_DURATION"], $aData["TAS_TIMEUNIT"], $arrayCalendarData);
+        $initDate = $this->getDelDelegateDate();
+        $timeZone = \ProcessMaker\Util\DateTime::convertUtcToTimeZone($initDate);
+        $dueDate = $calendar->dashCalculateDate($timeZone, $aData["TAS_DURATION"], $aData["TAS_TIMEUNIT"], $arrayCalendarData);
 
-        //Return
+        $dueDate = \ProcessMaker\Util\DateTime::convertDataToUtc($dueDate);
         return $dueDate;
     }
 
diff --git a/workflow/engine/methods/cases/cases_Step.php b/workflow/engine/methods/cases/cases_Step.php
index 8b1b1ff3f..24f085044 100644
--- a/workflow/engine/methods/cases/cases_Step.php
+++ b/workflow/engine/methods/cases/cases_Step.php
@@ -1009,7 +1009,7 @@ try {
                     $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_TRANSFER_HIDDEN_FLY'] = "<input type=hidden name='" . $hiddenName . "[NEXT_TASK][TAS_TRANSFER_HIDDEN_FLY]' id='" . $hiddenName . "[NEXT_TASK][TAS_TRANSFER_HIDDEN_FLY]' value=" . $aValues['NEXT_TASK']['TAS_TRANSFER_FLY'] . ">";
                     if ($aValues['NEXT_TASK']['TAS_TRANSFER_FLY'] == 'true') {
                         $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_DURATION'] = '<input type="text" size="5" name="' . $hiddenName . '[NEXT_TASK][TAS_DURATION]" id="' . $hiddenName . '[NEXT_TASK][TAS_DURATION]" value="' . $aValues['NEXT_TASK']['TAS_DURATION'] . '">';
-                        $hoursSelected = $daysSelected = '';
+                        $hoursSelected = $daysSelected = $minSelected = '';
                         if ($aFields['TASK'][$sKey]['NEXT_TASK']['TAS_TIMEUNIT'] == 'HOURS') {
                             $hoursSelected = "selected = 'selected'";
                         } else {
diff --git a/workflow/engine/src/ProcessMaker/Core/RoutingScreen.php b/workflow/engine/src/ProcessMaker/Core/RoutingScreen.php
index d6dd9c209..dafe61a98 100644
--- a/workflow/engine/src/ProcessMaker/Core/RoutingScreen.php
+++ b/workflow/engine/src/ProcessMaker/Core/RoutingScreen.php
@@ -65,6 +65,9 @@ class RoutingScreen extends \Derivation
                     } else {
                         $aDataMerged[$key]['NEXT_ROUTING'][] = $post[$i];
                     }
+                    if (isset($post[$i]['NEXT_TASK'])) {
+                        $aDataMerged[$key]['NEXT_TASK'] = $post[$i]['NEXT_TASK'];
+                    }
                 }
             }
         }