diff --git a/module/execution/control.php b/module/execution/control.php
index dd12cba423..5ba2a928da 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -1834,7 +1834,7 @@ class execution extends control
                 return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $this->createLink('doc', 'objectLibs', "type=execution")));
             }
 
-            if(!empty($projectID) and strpos(',kanban,agileplus,', ",$project->model,") !== false)
+            if(!empty($projectID) and strpos(',kanban,agileplus,waterfallplus,', ",$project->model,") !== false)
             {
                 $execution = $this->execution->getById($executionID);
                 if($execution->type == 'kanban') $this->loadModel('kanban')->createRDKanban($execution);
diff --git a/module/programplan/model.php b/module/programplan/model.php
index a2c65be320..15d82b1d11 100755
--- a/module/programplan/model.php
+++ b/module/programplan/model.php
@@ -921,6 +921,11 @@ class programplanModel extends model
                 if(!dao::isError())
                 {
                     $stageID = $this->dao->lastInsertID();
+                    if($data->type == 'kanban')
+                    {
+                        $execution = $this->execution->getByID($stageID);
+                        $this->loadModel('kanban')->createRDKanban($execution);
+                    }
 
                     if($data->acl != 'open') $this->user->updateUserView($stageID, 'sprint');