--- a/src/parallel_execution/dependency.c	Tue May 03 17:29:21 2016 +0900
+++ b/src/parallel_execution/dependency.c	Tue Jun 07 18:43:21 2016 +0900
@@ -8,7 +8,7 @@
 }
 
 __code waitFor1(struct Context* context, struct Task* master, struct Task* slave, struct Element* element) {
-    element->task = slave;
+    element->data = (union Data *)slave;
     // enqueue waitMe
     goto meta_waitFor(context, master->waitMe, PutQueue1);
 }
@@ -35,15 +35,13 @@
 
 __code spawnTask(struct Context* context, struct Task* task, struct Element* element, struct Queue* activeQueue, struct Queue* waitQueue) {
     //printf("spawn Task\n");
+    element->data = (union Data *)task;
     if (task->waitI->count == task->idsCount) {
         //printf("put ActiveQueue\n");
-        element->task = task;
         // enqueue activeQueue
         goto meta_spawnTask(context, activeQueue, PutQueue1);
-    }
-    else {
+    } else {
         //printf("put WaitQueue\n");
-        element->task = task;
         // enqueue waitQueue
         goto meta_spawnTask(context, waitQueue, PutQueue1);
     }