diff --git a/module/block/control.php b/module/block/control.php
index 26da592ad3..b239a039b5 100644
--- a/module/block/control.php
+++ b/module/block/control.php
@@ -598,14 +598,7 @@ class block extends control
                 unset($todos[$key]);
                 continue;
             }
-            foreach($tasks as $task)
-            {
-                if($todo->type == 'task' and $todo->idvalue == $task->id)
-                {
-                    unset($todos[$key]);
-                    break;
-                }
-            }
+            if($todo->type == 'task' and isset($tasks[$todo->idvalue])) unset($todos[$key]);
         }
 
         $this->view->todos = $todos;
@@ -1740,13 +1733,10 @@ class block extends control
                         unset($objects[$key]);
                         continue;
                     }
-                    foreach($tasks as $task)
+                    if($todo->type == 'task' and isset($tasks[$todo->idvalue]))
                     {
-                        if($todo->type == 'task' and $todo->idvalue == $task->id)
-                        {
-                            unset($objects[$key]);
-                            break;
-                        }
+                        unset($objects[$key]);
+                        continue;
                     }
 
                     $todo->begin = date::formatTime($todo->begin);
diff --git a/module/my/control.php b/module/my/control.php
index 4ac22b9ba1..35e7b20172 100644
--- a/module/my/control.php
+++ b/module/my/control.php
@@ -148,18 +148,8 @@ class my extends control
         $sort = $this->loadModel('common')->appendOrder($orderBy);
 
         $todos = $this->loadModel('todo')->getList($type, $account, $status, 0, $pager, $sort);
-        $tasks  = $this->loadModel('task')->getUserSuspendedTasks($account);
-        foreach($todos as $key => $todo)
-        {
-            foreach($tasks as $task)
-            {
-                if($todo->type == 'task' and $todo->idvalue = $task->id)
-                {
-                    unset($todos[$key]);
-                    break;
-                }
-            }
-        }
+        $tasks = $this->loadModel('task')->getUserSuspendedTasks($account);
+        foreach($todos as $key => $todo) if($todo->type == 'task' and isset($tasks[$todo->idvalue])) unset($todos[$key]);
 
         $pager->recTotal = count($todos);