diff --git a/module/metric/calc/user/scale/count_of_assigned_task_in_user.php b/module/metric/calc/user/scale/count_of_assigned_task_in_user.php
index ad04f5c187..6585992f2f 100755
--- a/module/metric/calc/user/scale/count_of_assigned_task_in_user.php
+++ b/module/metric/calc/user/scale/count_of_assigned_task_in_user.php
@@ -22,7 +22,7 @@ class count_of_assigned_task_in_user extends baseCalc
 {
     public $dataset = 'getTasksWithTeam';
 
-    public $fieldList = array('t1.id', "case when t1.mode != '' and t4.status != 'done' then t4.account else t1.assignedTo end as assignedTo", 't1.status', 't1.mode', 't4.account', 't3.status as projectStatus', 't2.status as executionStatus', 't4.status as teamStatus');
+    public $fieldList = array('t1.id', "CASE WHEN t1.mode != '' AND t4.status != 'done' THEN t4.account ELSE t1.assignedTo END AS assignedTo", 't1.status', 't1.mode', 't4.account', 't3.status AS projectStatus', 't2.status AS executionStatus', 't4.status AS teamStatus');
 
     public $result = array();
 
diff --git a/module/task/tao.php b/module/task/tao.php
index d8bb25ed95..aa7f1b3145 100644
--- a/module/task/tao.php
+++ b/module/task/tao.php
@@ -545,7 +545,7 @@ class taskTao extends taskModel
         $orderBy = str_replace('pri_', 'priOrder_', $orderBy);
         $orderBy = str_replace('project_', 't1.project_', $orderBy);
 
-        return $this->dao->select("t1.*, t4.id as project, t2.id as executionID, t2.name as executionName, t4.name as projectName, t2.multiple as executionMultiple, t2.type as executionType, t3.id as storyID, t3.title as storyTitle, t3.status AS storyStatus, t3.version AS latestStoryVersion, IF(t1.`pri` = 0, {$this->config->maxPriValue}, t1.`pri`) as priOrder")
+        return $this->dao->select("t1.*, t4.id AS project, t2.id AS executionID, t2.name AS executionName, t4.name AS projectName, t2.multiple AS executionMultiple, t2.type AS executionType, t3.id AS storyID, t3.title AS storyTitle, t3.status AS storyStatus, t3.version AS latestStoryVersion, IF(t1.`pri` = 0, {$this->config->maxPriValue}, t1.`pri`) AS priOrder")
             ->from(TABLE_TASK)->alias('t1')
             ->leftJoin(TABLE_EXECUTION)->alias('t2')->on('t1.execution = t2.id')
             ->leftJoin(TABLE_STORY)->alias('t3')->on('t1.story = t3.id')