diff --git a/library/RAW_NS.ttcnpp b/library/RAW_NS.ttcnpp
index c5b0d50..58910d9 100644
--- a/library/RAW_NS.ttcnpp
+++ b/library/RAW_NS.ttcnpp
@@ -271,7 +271,8 @@
  **********************************************************************************/
 
 /* perform inbound SNS-SIZE procedure */
-function f_incoming_sns_size(template (omit) NsCause cause := omit, integer idx := 0)
+function f_incoming_sns_size(template (omit) NsCause cause := omit, integer idx := 0,
+			     template integer num_max_nsvcs := ?, template integer num_ep := ?)
 runs on RAW_NS_CT {
 	log("f_incoming_sns_size(idx=", idx, ")");
 	var PDU_NS rx;
@@ -279,12 +280,12 @@
 
 	if (nsvc_cfg.provider.ip.address_family == AF_INET) {
 		/* expect one single SNS-SIZE with RESET flag; 4x v4 EP; no v6 EP */
-		rx := f_ns_exp(tr_SNS_SIZE(g_nsconfig.nsei, rst_flag := true, max_nsvcs := 8,
-					   num_v4 := 4, num_v6 := omit), idx);
+		rx := f_ns_exp(tr_SNS_SIZE(g_nsconfig.nsei, rst_flag := true, max_nsvcs := num_max_nsvcs,
+					   num_v4 := num_ep, num_v6 := omit), idx);
 	} else {
 		/* expect one single SNS-SIZE with RESET flag; no v4 EP; 4x v6 EP */
-		rx := f_ns_exp(tr_SNS_SIZE(g_nsconfig.nsei, rst_flag := true, max_nsvcs := 8,
-					   num_v4 := omit, num_v6 := 4), idx);
+		rx := f_ns_exp(tr_SNS_SIZE(g_nsconfig.nsei, rst_flag := true, max_nsvcs := num_max_nsvcs,
+					   num_v4 := omit, num_v6 := num_ep), idx);
 	}
 	NSCP[idx].send(ts_SNS_SIZE_ACK(g_nsconfig.nsei, cause));
 }