diff --git a/lib/classes/patch/370a7.class.php b/lib/classes/patch/370a7.class.php
index d1eaac098d..0801398515 100644
--- a/lib/classes/patch/370a7.class.php
+++ b/lib/classes/patch/370a7.class.php
@@ -61,41 +61,149 @@ class patch_370a7 implements patchInterface
     public function apply(base &$appbox)
     {
         $task_manager = new task_manager($appbox);
-        /* @var $task task_abstract */
+
+        $ttasks = array();
+        $conn = $appbox->get_connection();
+        $sql = 'SELECT task_id, active, name, class, settings FROM task2 WHERE class=\'task_period_workflow01\' OR class=\'task_period_ftv\'';
+        if (($stmt = $conn->prepare($sql)) !== FALSE) {
+            $stmt->execute();
+            $ttasks = $row = $stmt->fetchAll();
+            $stmt->closeCursor();
+        }
+
         $tdom = array();     // key = period
-        foreach ($task_manager->getTasks() as $task) {
+        $taskstodel = array();
+        foreach ($ttasks as $task) {
             $active = true;
             $warning = array();
 
             /*
              * migrating task 'workflow01' or 'task_period_ftv'
              */
-            if (get_class($task) === 'task_period_workflow01' || get_class($task) === 'task_period_ftv') {
-                $x = $task->getSettings();
-                if (($sx = simplexml_load_string($x)) !== FALSE) {
-                    $period = (int) ($sx->period);
+            $x = $task['settings'];
+            if (($sx = simplexml_load_string($x)) !== FALSE) {
+                $period = (int) ($sx->period);
 
-                    if ( ! array_key_exists('_' . $period, $tdom)) {
-                        $dom = new DOMDocument('1.0', 'UTF-8');
-                        $dom->formatOutput = true;
-                        $dom->preserveWhiteSpace = false;
-                        $ts = $dom->appendChild($dom->createElement('tasksettings'));
-                        $ts->appendChild($dom->createElement('period'))->appendChild($dom->createTextNode(60 * $period));
-                        $ts->appendChild($dom->createElement('logsql'))->appendChild($dom->createTextNode('1'));
-                        $tasks = $ts->appendChild($dom->createElement('tasks'));
-                        $tdom['_' . $period] = array('dom'   => $dom, 'tasks' => $tasks);
+                if ( ! array_key_exists('_' . $period, $tdom)) {
+                    $dom = new DOMDocument('1.0', 'UTF-8');
+                    $dom->formatOutput = true;
+                    $dom->preserveWhiteSpace = false;
+                    $ts = $dom->appendChild($dom->createElement('tasksettings'));
+                    $ts->appendChild($dom->createElement('period'))->appendChild($dom->createTextNode(60 * $period));
+                    $ts->appendChild($dom->createElement('logsql'))->appendChild($dom->createTextNode('1'));
+                    $tasks = $ts->appendChild($dom->createElement('tasks'));
+                    $tdom['_' . $period] = array('dom'   => $dom, 'tasks' => $tasks);
+                } else {
+                    $dom = &$tdom['_' . $period]['dom'];
+                    $tasks = &$tdom['_' . $period]['tasks'];
+                }
+
+                /*
+                 * migrating task 'workflow01'
+                 */
+                if ($task['class'] === 'task_period_workflow01') {
+                    $t = $tasks->appendChild($dom->createElement('task'));
+                    $t->setAttribute('active', '0');
+//                        $t->setAttribute('name', 'imported from \'' . $task->getTitle() . '\'');
+                    $t->setAttribute('name', 'imported from \'' . $task['name'] . '\'');
+                    $t->setAttribute('action', 'update');
+
+                    if ($sx->sbas_id) {
+                        $sbas_id = trim($sx->sbas_id);
+                        if ($sbas_id != '' && is_numeric($sbas_id)) {
+                            $t->setAttribute('sbas_id', $sx->sbas_id);
+                        } else {
+                            $warning[] = sprintf("Bad sbas_id '%s'", $sbas_id);
+                            $active = false;
+                        }
                     } else {
-                        $dom = &$tdom['_' . $period]['dom'];
-                        $tasks = &$tdom['_' . $period]['tasks'];
+                        $warning[] = sprintf("missing sbas_id");
+                        $active = false;
                     }
 
-                    /*
-                     * migrating task 'workflow01'
-                     */
-                    if (get_class($task) === 'task_period_workflow01') {
-                        $t = $tasks->appendChild($dom->createElement('task'));
+                    // 'from' section
+                    $from = $t->appendChild($dom->createElement('from'));
+                    if ($sx->coll0) {
+                        if (($coll0 = trim($sx->coll0)) != '') {
+                            if (is_numeric($coll0)) {
+                                $n = $from->appendChild($dom->createElement('coll'));
+                                $n->setAttribute('compare', '=');
+                                $n->setAttribute('id', $coll0);
+                            } else {
+                                $warning[] = sprintf("Bad (from) coll_id '%s'", $coll0);
+                                $active = false;
+                            }
+                        }
+                    }
+                    if ($sx->status0 && trim($sx->status0) != '') {
+                        $st = explode('_', trim($sx->status0));
+                        if (count($st) == 2) {
+                            $bit = (int) ($st[0]);
+                            if ($bit >= 0 && $bit <= 63 && ($st[1] == '0' || $st[1] == '1')) {
+                                $from->appendChild($dom->createElement('status'))
+                                    ->setAttribute('mask', $st[1] . str_repeat('x', $bit - 1));
+                            } else {
+                                $warning[] = sprintf("Bad (from) status '%s'", trim($sx->status0));
+                                $active = false;
+                            }
+                        } else {
+                            $warning[] = sprintf("Bad (from) status '%s'", trim($sx->status0));
+                            $active = false;
+                        }
+                    }
+
+                    // 'to' section
+                    $to = $t->appendChild($dom->createElement('to'));
+                    if ($sx->coll1) {
+                        if (($coll1 = trim($sx->coll1)) != '') {
+                            if (is_numeric($coll1)) {
+                                $n = $to->appendChild($dom->createElement('coll'));
+                                $n->setAttribute('id', $coll1);
+                            } else {
+                                $warning[] = sprintf("Bad (to) coll_id '%s'", $coll1);
+                                $active = false;
+                            }
+                        }
+                    }
+                    if ($sx->status1 && trim($sx->status1) != '') {
+                        $st = explode('_', trim($sx->status1));
+                        if (count($st) == 2) {
+                            $bit = (int) ($st[0]);
+                            if ($bit >= 0 && $bit <= 63 && ($st[1] == '0' || $st[1] == '1')) {
+                                $to->appendChild($dom->createElement('status'))
+                                    ->setAttribute('mask', $st[1] . str_repeat('x', $bit - 1));
+                            } else {
+                                $warning[] = sprintf("Bad (to) status '%s'", trim($sx->status1));
+                                $active = false;
+                            }
+                        } else {
+                            $warning[] = sprintf("Bad (to) status '%s'", trim($sx->status1));
+                            $active = false;
+                        }
+                    }
+
+                    if ($active && $task['active'] == '1') {
+                        $t->setAttribute('active', '1');
+                    }
+                    foreach ($warning as $w) {
+                        $t->appendChild($dom->createComment($w));
+                    }
+
+                    $taskstodel[] = $task['task_id'];
+                }
+
+                /*
+                 * migrating task 'task_period_ftv'
+                 */
+                if ($task['class'] === 'task_period_ftv') {
+                    foreach ($sx->tasks->task as $sxt) {
+                        $active = true;
+                        $warning = array();
+
+                        $t = $dom->importNode(dom_import_simplexml($sxt), true);
                         $t->setAttribute('active', '0');
-                        $t->setAttribute('name', 'imported from \'' . $task->getTitle() . '\'');
+//                            $t->setAttribute('name', 'imported from \'' . $task->getTitle() . '\'');
+                        $t->setAttribute('name', 'imported from \'' . $task['name'] . '\'');
                         $t->setAttribute('action', 'update');
 
                         if ($sx->sbas_id) {
@@ -111,132 +219,34 @@ class patch_370a7 implements patchInterface
                             $active = false;
                         }
 
-                        // 'from' section
-                        $from = $t->appendChild($dom->createElement('from'));
-                        if ($sx->coll0) {
-                            if (($coll0 = trim($sx->coll0)) != '') {
-                                if (is_numeric($coll0)) {
-                                    $n = $from->appendChild($dom->createElement('coll'));
-                                    $n->setAttribute('compare', '=');
-                                    $n->setAttribute('id', $coll0);
-                                } else {
-                                    $warning[] = sprintf("Bad (from) coll_id '%s'", $coll0);
-                                    $active = false;
-                                }
-                            }
-                        }
-                        if ($sx->status0 && trim($sx->status0) != '') {
-                            $st = explode('_', trim($sx->status0));
-                            if (count($st) == 2) {
-                                $bit = (int) ($st[0]);
-                                if ($bit >= 0 && $bit <= 63 && ($st[1] == '0' || $st[1] == '1')) {
-                                    $from->appendChild($dom->createElement('status'))
-                                        ->setAttribute('mask', $st[1] . str_repeat('x', $bit - 1));
-                                } else {
-                                    $warning[] = sprintf("Bad (from) status '%s'", trim($sx->status0));
-                                    $active = false;
-                                }
-                            } else {
-                                $warning[] = sprintf("Bad (from) status '%s'", trim($sx->status0));
-                                $active = false;
-                            }
-                        }
-
-                        // 'to' section
-                        $to = $t->appendChild($dom->createElement('to'));
-                        if ($sx->coll1) {
-                            if (($coll1 = trim($sx->coll1)) != '') {
-                                if (is_numeric($coll1)) {
-                                    $n = $to->appendChild($dom->createElement('coll'));
-                                    $n->setAttribute('id', $coll1);
-                                } else {
-                                    $warning[] = sprintf("Bad (to) coll_id '%s'", $coll1);
-                                    $active = false;
-                                }
-                            }
-                        }
-                        if ($sx->status1 && trim($sx->status1) != '') {
-                            $st = explode('_', trim($sx->status1));
-                            if (count($st) == 2) {
-                                $bit = (int) ($st[0]);
-                                if ($bit >= 0 && $bit <= 63 && ($st[1] == '0' || $st[1] == '1')) {
-                                    $to->appendChild($dom->createElement('status'))
-                                        ->setAttribute('mask', $st[1] . str_repeat('x', $bit - 1));
-                                } else {
-                                    $warning[] = sprintf("Bad (to) status '%s'", trim($sx->status1));
-                                    $active = false;
-                                }
-                            } else {
-                                $warning[] = sprintf("Bad (to) status '%s'", trim($sx->status1));
-                                $active = false;
-                            }
-                        }
-
-                        if ($active && $task->isActive()) {
+                        if ($active && $task['active'] == '1') {
                             $t->setAttribute('active', '1');
                         }
                         foreach ($warning as $w) {
                             $t->appendChild($dom->createComment($w));
                         }
-                    }
 
-                    /*
-                     * migrating task 'task_period_ftv'
-                     */
-                    if (get_class($task) === 'task_period_ftv') {
-                        foreach ($sx->tasks->task as $sxt) {
-                            $active = true;
-                            $warning = array();
-
-                            $t = $dom->importNode(dom_import_simplexml($sxt), true);
-                            $t->setAttribute('active', '0');
-                            $t->setAttribute('name', 'imported from \'' . $task->getTitle() . '\'');
-                            $t->setAttribute('action', 'update');
-
-                            if ($sx->sbas_id) {
-                                $sbas_id = trim($sx->sbas_id);
-                                if ($sbas_id != '' && is_numeric($sbas_id)) {
-                                    $t->setAttribute('sbas_id', $sx->sbas_id);
-                                } else {
-                                    $warning[] = sprintf("Bad sbas_id '%s'", $sbas_id);
-                                    $active = false;
-                                }
-                            } else {
-                                $warning[] = sprintf("missing sbas_id");
-                                $active = false;
+                        $x = new DOMXPath($dom);
+                        $nlfrom = $x->query('from', $t);
+                        if ($nlfrom->length == 1) {
+                            $nlcoll = $x->query('colls', $nlfrom->item(0));
+                            if ($nlcoll->length > 0) {
+                                $nn = $dom->createElement('coll');
+                                $nn->setAttribute('compare', '=');
+                                $nn->setAttribute('id', $nlcoll->item(0)->getAttribute('id'));
+                                $nlfrom->item(0)->replaceChild($nn, $nlcoll->item(0));
                             }
 
-                            if ($active && $task->isActive()) {
-                                $t->setAttribute('active', '1');
-                            }
-                            foreach ($warning as $w) {
-                                $t->appendChild($dom->createComment($w));
-                            }
-
-                            $x = new DOMXPath($dom);
-                            $nlfrom = $x->query('from', $t);
-                            if($nlfrom->length == 1)
-                            {
-                                $nlcoll = $x->query('colls', $nlfrom->item(0));
-                                if( $nlcoll->length > 0 )
-                                {
-                                    $nn = $dom->createElement('coll');
-                                    $nn->setAttribute('compare', '=');
-                                    $nn->setAttribute('id', $nlcoll->item(0)->getAttribute('id'));
-                                    $nlfrom->item(0)->replaceChild($nn, $nlcoll->item(0));
-                                }
-
-                                $tasks->appendChild($t);
-                            }
+                            $tasks->appendChild($t);
                         }
                     }
+
+                    $taskstodel[] = $task['task_id'];
                 }
-                /*
-                * keep old task for reference but do not start
-                */
-                // $task->delete();
-                $task->setTitle("TO DELETE : ".$task->getTitle());
-                $task->setActive(false);
+            }
+
+            if (count($taskstodel) > 0) {
+//                $conn->exec('DELETE FROM task2 WHERE task_id IN(' . implode(',', $taskstodel) . ')');
             }
         }