diff --git a/module/bug/model.php b/module/bug/model.php
index 00ba767c74..4235d7116a 100644
--- a/module/bug/model.php
+++ b/module/bug/model.php
@@ -842,9 +842,8 @@ class bugModel extends model
     public function getProjectBugs($projectID, $orderBy = 'id_desc', $pager = null, $build = 0)
     {
         $bugs = $this->dao->select('*')->from(TABLE_BUG)
-            ->where('project')->eq((int)$projectID)
-            ->beginIF($build != 0)->andWhere('openedBuild')->eq($build)->fi()
-            ->andWhere('deleted')->eq(0)
+            ->where('deleted')->eq(0)
+            ->andWhere("(project = '" . (int)$projectID . "' " . (empty($build) ? '' : "OR CONCAT(',', openedBuild, ',') like '%,$build,%'") . ")")
             ->orderBy($orderBy)->page($pager)->fetchAll();
 
         $this->loadModel('common')->saveQueryCondition($this->dao->get(), 'bug');
diff --git a/module/product/lang/en.php b/module/product/lang/en.php
index 870d2f51bb..718baf2221 100644
--- a/module/product/lang/en.php
+++ b/module/product/lang/en.php
@@ -75,7 +75,7 @@ $lang->product->closedByMe   = 'My closed';
 $lang->product->draftStory   = 'Draft';
 $lang->product->activeStory  = 'Active';
 $lang->product->changedStory = 'Changed';
-$lang->product->willClose    = 'Will close';
+$lang->product->willClose    = 'Closing';
 $lang->product->closedStory  = 'Closed';
 $lang->product->unclosed     = 'Unclosed';