diff --git a/module/project/control.php b/module/project/control.php
index 06fa156006..cf3fef2b6f 100755
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -578,7 +578,6 @@ class project extends control
             $multiple    = $copyProject->multiple;
             $hasProduct  = $copyProject->hasProduct;
             $programID   = $copyProject->parent;
-            $model       = $copyProject->model;
             $products    = $this->product->getProducts($copyProjectID);
 
             if(!$copyProject->hasProduct) $shadow = 1;
diff --git a/module/project/model.php b/module/project/model.php
index 69e732bcef..10892907d5 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -1090,12 +1090,15 @@ class projectModel extends model
     {
         if(defined('TUTORIAL')) return $this->loadModel('tutorial')->getProjectPairs();
 
+        if($model == 'agileplus')     $model = array('scrum', 'agileplus');
+        if($model == 'waterfallplus') $model = array('waterfall', 'waterfallplus');
+
         $projects = $this->dao->select('id, name, path')->from(TABLE_PROJECT)
             ->where('type')->eq('project')
             ->andWhere('deleted')->eq('0')
             ->beginIF($programID)->andWhere('parent')->eq($programID)->fi()
             ->beginIF($this->config->vision)->andWhere('vision')->eq($this->config->vision)->fi()
-            ->beginIF($model != 'all')->andWhere('model')->eq($model)->fi()
+            ->beginIF($model != 'all')->andWhere('model')->in($model)->fi()
             ->beginIF(strpos($param, 'noclosed') !== false)->andWhere('status')->ne('closed')->fi()
             ->beginIF(strpos($param, 'multiple') !== false)->andWhere('multiple')->eq('1')->fi()
             ->beginIF(!$this->app->user->admin)->andWhere('id')->in($this->app->user->view->projects)->fi()
diff --git a/module/project/view/create.html.php b/module/project/view/create.html.php
index 42c9cddd97..5fa5aff2a4 100755
--- a/module/project/view/create.html.php
+++ b/module/project/view/create.html.php
@@ -48,7 +48,7 @@
       <h2><?php echo $createTitle;?></h2>
       <?php if(!commonModel::isTutorialMode()): ?>
       <div class="pull-right btn-toolbar">
-      <?php if($config->edition != 'max' || $model == 'kanban'):?>
+      <?php if($config->edition != 'max' or $model == 'kanban'):?>
         <button type='button' class='btn btn-link' data-toggle='modal' data-target='#copyProjectModal'><?php echo html::icon($lang->icons['copy'], 'muted') . ' ' . $lang->project->copy;?></button>
       <?php else: ?>
         <button type='button' class='btn btn-link open-btn' data-toggle='modal' data-target='#maxCopyProjectModal'><?php echo html::icon($lang->icons['copy'], 'muted') . ' ' . $lang->project->copy;?></button>