diff --git a/module/programplan/control.php b/module/programplan/control.php
index 8f37428e27..9e75a81a20 100644
--- a/module/programplan/control.php
+++ b/module/programplan/control.php
@@ -102,9 +102,6 @@ class programplan extends control
         $productList = $this->session->hasProduct ? $this->product->getProductPairsByProject($projectID) : array();
         $executions  = !empty($planID) ? $this->loadModel('execution')->getChildExecutions($planID, 'order_asc') : array();
 
-        /* Set programplan typeList. */
-        if($executionType != 'stage') unset($this->lang->execution->typeList[''], $this->lang->execution->typeList['stage']);
-
         $plans = $this->programplan->getStage($planID ?: $projectID, $this->productID, 'parent', 'order_asc');
         if(!empty($planID) and in_array($project->model, array('ipd', 'waterfallplus')))
         {
@@ -120,6 +117,9 @@ class programplan extends control
             }
         }
 
+        /* Set programplan typeList. */
+        if($executionType != 'stage') unset($this->lang->execution->typeList[''], $this->lang->execution->typeList['stage']);
+
         $viewData = new stdclass();
         $viewData->productID     = $productID;
         $viewData->planID        = $planID;
diff --git a/module/programplan/model.php b/module/programplan/model.php
index 038fa1aa42..fc15839bd9 100755
--- a/module/programplan/model.php
+++ b/module/programplan/model.php
@@ -572,7 +572,7 @@ class programplanModel extends model
 
             if(empty($statusCount)) continue;
 
-            $result       = $this->programplanTao->getNewParentAndAction($statusCount, $parent, (int)$startTasks, $action, $project);
+            $result       = $this->getNewParentAndAction($statusCount, $parent, (int)$startTasks, $action, $project);
             $newParent    = $result['newParent'] ?? null;
             $parentAction = $result['parentAction'] ?? '';
 
diff --git a/module/programplan/ui/create.html.php b/module/programplan/ui/create.html.php
index 1fef0c9061..f142958896 100644
--- a/module/programplan/ui/create.html.php
+++ b/module/programplan/ui/create.html.php
@@ -130,7 +130,7 @@ $fnGenerateFields = function() use ($config, $lang, $requiredFields, $showFields
         }
 
         /* Field for agileplus. */
-        if($name == 'type' && $planID != 0 && $executionType == 'agileplus')
+        if($name == 'type' && $planID != 0)
         {
             $field['hidden'] = false;
             $field['items']  = $lang->execution->typeList;
diff --git a/module/programplan/zen.php b/module/programplan/zen.php
index 5e9ad182af..43673b9dff 100644
--- a/module/programplan/zen.php
+++ b/module/programplan/zen.php
@@ -266,7 +266,7 @@ class programplanZen extends programplan
             if($field) $visibleFields[$field] = '';
         }
 
-        foreach(explode(',', $this->config->programplan->create->requiredFields) as $field)
+        foreach(explode(',', $this->config->execution->create->requiredFields) as $field)
         {
             if($field)
             {