diff --git a/src/gb/gprs_ns2_vc_fsm.c b/src/gb/gprs_ns2_vc_fsm.c
index 33a0328..7b07a49 100644
--- a/src/gb/gprs_ns2_vc_fsm.c
+++ b/src/gb/gprs_ns2_vc_fsm.c
@@ -469,9 +469,9 @@
 	/* TODO: nsh->data[0] -> C/R only valid in IP SNS */
 	bvci = nsh->data[1] << 8 | nsh->data[2];
 
-	msgb_bssgph(msg) = &nsh->data[3];
-	msgb_bvci(msg) = nsp.bvci = bvci;
-	msgb_nsei(msg) = nsp.nsei = priv->nsvc->nse->nsei;
+	msg->l3h = &nsh->data[3];
+	nsp.bvci = bvci;
+	nsp.nsei = priv->nsvc->nse->nsei;
 
 	if (nsh->data[0])
 		nsp.u.unitdata.change = NS_ENDPOINT_REQUEST_CHANGE;