Index: kernel/generic/src/proc/task.c
===================================================================
--- kernel/generic/src/proc/task.c	(revision 764c302a6272fd5764d4e38c8b741894512c5c2a)
+++ kernel/generic/src/proc/task.c	(revision d46c6ecd4bb1934b64d8c11726ffed69e5897343)
@@ -116,5 +116,5 @@
 	ta->main_thread = NULL;
 	ta->refcount = 0;
-	ta->context = THE->context;
+	ta->context = CONTEXT;
 
 	ta->capabilities = 0;
@@ -122,7 +122,7 @@
 	
 	ipc_answerbox_init(&ta->answerbox);
-	for (i=0; i < IPC_MAX_PHONES;i++)
+	for (i = 0; i < IPC_MAX_PHONES; i++)
 		ipc_phone_init(&ta->phones[i]);
-	if (ipc_phone_0)
+	if ((ipc_phone_0) && (context_check(ipc_phone_0->task->context, ta->context)))
 		ipc_phone_connect(&ta->phones[0], ipc_phone_0);
 	atomic_set(&ta->active_calls, 0);
Index: kernel/generic/src/proc/the.c
===================================================================
--- kernel/generic/src/proc/the.c	(revision 764c302a6272fd5764d4e38c8b741894512c5c2a)
+++ kernel/generic/src/proc/the.c	(revision d46c6ecd4bb1934b64d8c11726ffed69e5897343)
@@ -59,5 +59,4 @@
 	the->task = NULL;
 	the->as = NULL;
-	the->context = 0;
 }
 
Index: kernel/generic/src/proc/thread.c
===================================================================
--- kernel/generic/src/proc/thread.c	(revision 764c302a6272fd5764d4e38c8b741894512c5c2a)
+++ kernel/generic/src/proc/thread.c	(revision d46c6ecd4bb1934b64d8c11726ffed69e5897343)
@@ -319,5 +319,4 @@
 	memcpy(t->name, name, THREAD_NAME_BUFLEN);
 	
-	t->context = THE->context;
 	t->thread_code = func;
 	t->thread_arg = arg;
@@ -535,6 +534,6 @@
 		
 			t = (thread_t *) node->value[i];
-			printf("%s: address=%#zx, tid=%zd, context=%ld, state=%s, task=%#zx, code=%#zx, stack=%#zx, cpu=",
-				t->name, t, t->tid, t->context, thread_states[t->state], t->task, t->thread_code, t->kstack);
+			printf("%s: address=%#zx, tid=%zd, state=%s, task=%#zx, context=%ld, code=%#zx, stack=%#zx, cpu=",
+				t->name, t, t->tid, thread_states[t->state], t->task, t->task->context, t->thread_code, t->kstack);
 			if (t->cpu)
 				printf("cpu%zd", t->cpu->id);