diff --git a/module/api/control.php b/module/api/control.php
index 413a4d6959..e3cd66cf9c 100755
--- a/module/api/control.php
+++ b/module/api/control.php
@@ -787,9 +787,9 @@ EOT;
      */
     public function debug($filePath, $action)
     {
-        $filePath = helper::safe64Decode($filePath);
-        $fileBasePath = realpath(dirname($filePath));
-        if(strpos($fileBasePath, $this->app->appRoot . 'module') !== 0 && strpos($fileBasePath, $this->app->appRoot . 'extension') !== 0) return;
+        $filePath    = helper::safe64Decode($filePath);
+        $fileDirPath = realpath(dirname($filePath));
+        if(strpos($fileDirPath, $this->app->getModuleRoot()) !== 0 and strpos($fileDirPath, $this->app->getExtensionRoot()) !== 0) return;
         if($action == 'extendModel')
         {
             $method = $this->api->getMethod($filePath, 'Model');
diff --git a/module/story/control.php b/module/story/control.php
index 651cbe0ccd..1c44188ffa 100644
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -1235,6 +1235,7 @@ class story extends control
         $releaseApp = $tab == 'execution' ? 'product' : $tab;
         $this->session->set('productList', $uri . "#app={$tab}", 'product');
         $this->session->set('buildList',   $uri, $buildApp);
+        $this->app->loadLang('bug');
 
         $storyID = (int)$storyID;
         $story   = $this->story->getById($storyID, $version, true);
@@ -1315,7 +1316,6 @@ class story extends control
         $this->view->param              = $param;
         $this->view->builds             = $this->loadModel('build')->getStoryBuilds($storyID);
         $this->view->releases           = $this->loadModel('release')->getStoryReleases($storyID);
-        $this->view->bugStatusList      = $this->app->loadLang('bug')->bug->statusList;
 
         $this->display();
     }
diff --git a/module/story/view/view.html.php b/module/story/view/view.html.php
index 1799e212c8..b9ae0328d5 100644
--- a/module/story/view/view.html.php
+++ b/module/story/view/view.html.php
@@ -477,7 +477,7 @@
                     <?php
                     foreach($bugs as $bug)
                     {
-                        $bugInfo = "#$bug->id" . '&nbsp<span class="status-bug status-' . $bug->status .'">' . $bugStatusList[$bug->status]  . '</span>&nbsp' . $bug->title;
+                        $bugInfo = "#$bug->id" . '&nbsp<span class="status-bug status-' . $bug->status .'">' . $this->lang->bug->statusList[$bug->status]  . '</span>&nbsp' . $bug->title;
                         echo "<li title='$bug->title'>" . html::a($this->createLink('bug', 'view', "bugID=$bug->id", '', true), $bugInfo, '', "class='iframe' data-width='80%'") . '</li>';
                     }
                     ?>