Index: kernel/generic/src/ipc/kbox.c
===================================================================
--- kernel/generic/src/ipc/kbox.c	(revision 753d8515dfafce94cdf184d68aa5c942525400db)
+++ kernel/generic/src/ipc/kbox.c	(revision fd723123e15e0acd1e98c618cb1941a5f5354f09)
@@ -129,6 +129,6 @@
 	ipl = interrupts_disable();
 	spinlock_lock(&TASK->lock);
-	spinlock_lock(&TASK->answerbox.lock);
-	if (list_empty(&TASK->answerbox.connected_phones)) {
+	spinlock_lock(&TASK->kb.box.lock);
+	if (list_empty(&TASK->kb.box.connected_phones)) {
 		/*
 		 * Last phone has been disconnected. Detach this thread so it
@@ -151,5 +151,5 @@
 	}
 
-	spinlock_unlock(&TASK->answerbox.lock);
+	spinlock_unlock(&TASK->kb.box.lock);
 	spinlock_unlock(&TASK->lock);
 	interrupts_restore(ipl);