diff --git a/pcu/RAW_NS.ttcn b/pcu/RAW_NS.ttcn
index 4300376..9c31820 100644
--- a/pcu/RAW_NS.ttcn
+++ b/pcu/RAW_NS.ttcn
@@ -38,7 +38,7 @@
 		}
 }
 
-function f_init_ns_codec(integer idx := 0, float guard_secs := 60.0, integer tc_offset := 0) runs on RAW_NS_CT {
+function f_init_ns_codec(NSConfiguration ns_config, integer idx := 0, float guard_secs := 60.0, integer tc_offset := 0) runs on RAW_NS_CT {
 	var Result res;
 
 	if (not g_T_guard.running) {
@@ -48,10 +48,10 @@
 
 	if (not isbound(g_nsconfig) or not isbound(g_nsconfig[idx])) {
 		/* copy most parts from mp_nsconfig */
-		g_nsconfig[idx] := mp_nsconfig;
+		g_nsconfig[idx] := ns_config;
 		/* adjust those parts different for each NS-VC */
-		g_nsconfig[idx].nsvci := mp_nsconfig.nsvci + idx;
-		g_nsconfig[idx].local_udp_port := mp_nsconfig.local_udp_port + idx + tc_offset;
+		g_nsconfig[idx].nsvci := ns_config.nsvci + idx;
+		g_nsconfig[idx].local_udp_port := ns_config.local_udp_port + idx + tc_offset;
 	}
 
 	map(self:NSCP[idx], system:NSCP);