diff --git a/module/story/model.php b/module/story/model.php
index 54ff6699f8..01d0e00024 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -36,14 +36,12 @@ class storyModel extends model
         if($setImgSize) $story->spec   = $this->loadModel('file')->setImgSize($story->spec);
         if($setImgSize) $story->verify = $this->file->setImgSize($story->verify);
 
-        $story->projects = $this->dao->select('t1.project, t2.name, t2.status')
-            ->from(TABLE_PROJECTSTORY)->alias('t1')
-            ->leftJoin(TABLE_PROJECT)->alias('t2')
-            ->on('t1.project = t2.id')
+        $story->projects = $this->dao->select('t1.project, t2.name, t2.status')->from(TABLE_PROJECTSTORY)->alias('t1')
+            ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project = t2.id')
             ->where('t1.story')->eq($storyID)
             ->orderBy('t1.project DESC')
             ->fetchAll('project');
-        $story->tasks     = $this->dao->select('id, name, assignedTo, project, status, consumed, `left`')->from(TABLE_TASK)->where('story')->eq($storyID)->orderBy('id DESC')->fetchGroup('project');
+        $story->tasks     = $this->dao->select('id, name, assignedTo, project, status, consumed, `left`')->from(TABLE_TASK)->where('story')->eq($storyID)->andWhere('deleted')->eq(0)->orderBy('id DESC')->fetchGroup('project');
         //$story->bugCount  = $this->dao->select('COUNT(*)')->alias('count')->from(TABLE_BUG)->where('story')->eq($storyID)->fetch('count');
         //$story->caseCount = $this->dao->select('COUNT(*)')->alias('count')->from(TABLE_CASE)->where('story')->eq($storyID)->fetch('count');
         if($story->toBug) $story->toBugTitle = $this->dao->findById($story->toBug)->from(TABLE_BUG)->fetch('title');
diff --git a/module/story/view/view.html.php b/module/story/view/view.html.php
index 64d43f600c..5866a33c42 100644
--- a/module/story/view/view.html.php
+++ b/module/story/view/view.html.php
@@ -175,7 +175,7 @@
                     echo html::a($this->createLink('project', 'browse', "projectID=$task->project"), $projectName, '', "class='text-muted'") . '</li>';
                 }
             }
-            if(count($story->tasks, COUNT_NORMAL) == 0)
+            if(count($story->tasks) == 0)
             {
                 foreach($story->projects as $project)
                 {