Index: kernel/generic/src/ipc/ipc.c
===================================================================
--- kernel/generic/src/ipc/ipc.c	(revision 124c0612c8daeba21701095e42877933875fb33a)
+++ kernel/generic/src/ipc/ipc.c	(revision 8b65e5477a0b0f3212ff4ec991e53d3ab063eb6c)
@@ -295,6 +295,6 @@
 		atomic_inc(&phone->active_calls);
 		call->data.phone = phone;
-	}
-	call->data.task = TASK;
+		call->data.task = TASK;
+	}
 	
 	irq_spinlock_lock(&box->lock, true);
@@ -407,4 +407,5 @@
 			call->caller_phone = call->data.phone;
 		call->data.phone = newphone;
+		call->data.task = TASK;
 	}