Index: kernel/generic/src/ipc/ipc.c
===================================================================
--- kernel/generic/src/ipc/ipc.c	(revision e40e3007fc0de3d5c4a7a5ebec5db04d5a48ed6f)
+++ kernel/generic/src/ipc/ipc.c	(revision 27526e87a5c2020cd438d3e19be5de74210bc73d)
@@ -202,7 +202,7 @@
 
 	if (call->flags & IPC_CALL_FORWARDED) {
-		if (call->data.caller_phone) {
+		if (call->caller_phone) {
 			/* Demasquerade the caller phone. */
-			call->data.phone = call->data.caller_phone;
+			call->data.phone = call->caller_phone;
 		}
 	}
@@ -361,6 +361,6 @@
 
 	if (mode & IPC_FF_ROUTE_FROM_ME) {
-		if (!call->data.caller_phone)
-			call->data.caller_phone = call->data.phone;
+		if (!call->caller_phone)
+			call->caller_phone = call->data.phone;
 		call->data.phone = newphone;
 	}