diff --git a/module/execution/model.php b/module/execution/model.php
index 52724ab8d2..033be3706d 100755
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -5274,11 +5274,13 @@ class executionModel extends model
         $class = !empty($execution->children) ? 'disabled' : '';
         common::printIcon('task', 'create', "executionID={$execution->id}", '', 'list', '', '', $class, false, "data-app='execution'");
 
-        if($execution->type == 'stage')
+        $project = $this->loadModel('project')->getByID($execution->project);
+        if($execution->type == 'stage' or ($this->app->tab == 'project' and !empty($project->model) and $project->model == 'waterfallplus'))
         {
             $isCreateTask = $this->loadModel('programplan')->isCreateTask($execution->id);
             $disabled     = ($isCreateTask and $execution->type == 'stage') ? '' : ' disabled';
             $title        = !$isCreateTask ? $this->lang->programplan->error->createdTask : $this->lang->programplan->createSubPlan;
+            $title        = (!empty($disabled) and $execution->type != 'stage') ? $this->lang->programplan->error->notStage : $title;
             common::printIcon('programplan', 'create', "program={$execution->project}&productID=$productID&planID=$execution->id", $execution, 'list', 'split', '', $disabled, '', '', $title);
         }
 
diff --git a/module/kanban/js/view.js b/module/kanban/js/view.js
index 25e8edf42f..b2ead23b73 100644
--- a/module/kanban/js/view.js
+++ b/module/kanban/js/view.js
@@ -472,7 +472,6 @@ function renderExecutionItem(item, $item)
     ].join('')).appendTo($item);
 
     var $titleBox = $header.children('.executionName');
-    debugger
     if(!$titleBox.length) $titleBox = $(
     [
         '<div class="executionName">',