diff --git a/module/project/control.php b/module/project/control.php
index 1357c517f7..e22f67ec2e 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -704,16 +704,6 @@ class project extends control
 
         if($project->model != 'kanban') $canChangeModel = $this->project->checkCanChangeModel($projectID, $project->model);
 
-        /* Get stages group by project's product. */
-        $productStages = $this->dao->select('t1.product,t1.project')->from(TABLE_PROJECTPRODUCT)->alias('t1')
-            ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project = t2.id')
-            ->where('t2.deleted')->eq('0')
-            ->andWhere('t2.type')->ne('project')
-            ->andWhere('t2.project')->eq($projectID)
-            ->andWhere('t1.product')->in($linkedProductIdList)
-            ->groupBy('t1.product')
-            ->fetchGroup('product');
-
         $this->view->title      = $this->lang->project->edit;
         $this->view->position[] = $this->lang->project->edit;
 
@@ -729,7 +719,7 @@ class project extends control
         $this->view->linkedProducts           = $linkedProducts;
         $this->view->linkedBranches           = $linkedBranches;
         $this->view->branches                 = $branches;
-        $this->view->multiProductStages       = ($project->division and count($linkedProducts) > 1 and count($productStages) > 1);
+        $this->view->executions               = $this->execution->getPairs($projectID);
         $this->view->unmodifiableProducts     = $unmodifiableProducts;
         $this->view->unmodifiableBranches     = $unmodifiableBranches;
         $this->view->unmodifiableMainBranches = $unmodifiableMainBranches;
diff --git a/module/project/view/edit.html.php b/module/project/view/edit.html.php
index d937e56c53..cd0d690717 100755
--- a/module/project/view/edit.html.php
+++ b/module/project/view/edit.html.php
@@ -177,7 +177,7 @@
         </tr>
         <?php if($project->model == 'waterfall'):?>
         <?php $class    = (!$project->division and count($linkedProducts) < 2) ? 'hide' : '';?>
-        <?php $disabled = $multiProductStages ? "disabled='disabled'" : '';?>
+        <?php $disabled = !empty($executions) ? "disabled='disabled'" : '';?>
         <tr class='<?php echo $class;?> division'>
           <th><?php echo $lang->project->division;?></th>
           <td colspan='3'><?php echo html::radio('division', $lang->project->divisionList, $project->division, $disabled);?></td>
diff --git a/module/project/view/manageproducts.html.php b/module/project/view/manageproducts.html.php
index 9304ecc2cd..2148bb0231 100644
--- a/module/project/view/manageproducts.html.php
+++ b/module/project/view/manageproducts.html.php
@@ -87,14 +87,14 @@ $('#submit').click(function()
       {
           'message' : noticeDivsion,
           'buttons':{
-            confirm:{
-                label: divisionList['1'],
-                className: 'btn'
-            },
-            cancel:{
-                label: divisionList['0'],
-                className: 'btn-primary'
-            },
+              confirm:{
+                  label: divisionList['1'],
+                  className: 'btn'
+              },
+              cancel:{
+                  label: divisionList['0'],
+                  className: 'btn-primary'
+              },
           },
           callback: function(result)
           {