diff --git a/module/programplan/control.php b/module/programplan/control.php
index 7196cf267e..45450cdbcf 100644
--- a/module/programplan/control.php
+++ b/module/programplan/control.php
@@ -127,8 +127,7 @@ class programplan extends control
         $viewData->programPlan   = $programPlan;
         $viewData->productList   = $productList;
         $viewData->project       = $project;
-        $viewData->plans         = $plans;
-        $viewData->executions    = $executions;
+        $viewData->plans         = !empty($executions) ? $executions : $plans;
 
         $this->programplanZen->buildCreateView($viewData);
     }
diff --git a/module/programplan/ui/create.html.php b/module/programplan/ui/create.html.php
index cc95d406fd..63bda19a0c 100644
--- a/module/programplan/ui/create.html.php
+++ b/module/programplan/ui/create.html.php
@@ -211,7 +211,7 @@ $fnGenerateDefaultData = function() use ($config, $plans, $planID, $stages, $exe
         $item->realBegan    = $plan->realBegan;
         $item->realEnd      = $plan->realEnd;
         $item->desc         = $plan->desc;
-        $item->setMilestone = $plan->setMilestone;
+        $item->setMilestone = isset($plan->setMilestone) ? $plan->setMilestone : false;
         if(in_array($config->edition, array('max', 'ipd')) && $executionType == 'stage')
         {
             $item->output = empty($plan->output) ? 0 : explode(',', $plan->output);
diff --git a/module/programplan/zen.php b/module/programplan/zen.php
index c2fbd8f65c..a69ccbc39b 100644
--- a/module/programplan/zen.php
+++ b/module/programplan/zen.php
@@ -43,7 +43,7 @@ class programplanZen extends programplan
         $this->view->productID          = $viewData->productID ?: key($viewData->productList);
         $this->view->stages             = empty($viewData->planID) ? $this->loadModel('stage')->getStages('id_asc', 0, $viewData->project->model) : array();
         $this->view->programPlan        = $viewData->programPlan;
-        $this->view->plans              = empty($viewData->executions) ? $viewData->plans : $viewData->executions;
+        $this->view->plans              = $viewData->plans;
         $this->view->planID             = $viewData->planID;
         $this->view->type               = 'lists';
         $this->view->executionType      = $viewData->executionType;