diff --git a/module/build/model.php b/module/build/model.php
index 014c8cb6f1..1a635f60be 100644
--- a/module/build/model.php
+++ b/module/build/model.php
@@ -497,6 +497,7 @@ class buildModel extends model
     {
         $build = $this->getByID($buildID);
         $build->stories = trim(str_replace(",$storyID,", ',', ",$build->stories,"), ',');
+        if($build->stories) $build->stories = ',' . $build->stories;
         $this->dao->update(TABLE_BUILD)->set('stories')->eq($build->stories)->where('id')->eq((int)$buildID)->exec();
         $this->loadModel('action')->create('story', $storyID, 'unlinkedfrombuild', '', $buildID, '', false);
     }
@@ -559,6 +560,7 @@ class buildModel extends model
     {
         $build = $this->getByID($buildID);
         $build->bugs = trim(str_replace(",$bugID,", ',', ",$build->bugs,"), ',');
+        if($build->bugs) $build->bugs = ',' . $build->bugs;
         $this->dao->update(TABLE_BUILD)->set('bugs')->eq($build->bugs)->where('id')->eq((int)$buildID)->exec();
         $this->loadModel('action')->create('bug', $bugID, 'unlinkedfrombuild', '', $buildID, '', false);
     }