diff --git a/library/RAW_NS.ttcnpp b/library/RAW_NS.ttcnpp
index ff73348..93c43f0 100644
--- a/library/RAW_NS.ttcnpp
+++ b/library/RAW_NS.ttcnpp
@@ -100,7 +100,7 @@
 	var default d := activate(ax_rx_fail_on_any_ns());
 	alt {
 	[] NSCP[idx].receive(PDU_NS: exp_rx) -> value nrf { }
-	[g_handle_rx_alive] as_rx_alive_tx_ack();
+	[g_handle_rx_alive] as_rx_alive_tx_ack(idx := idx);
 	}
 	deactivate(d);
 	return nrf;
@@ -111,7 +111,7 @@
 	NSCP[idx].send(t_NS_ALIVE);
 	alt {
 	[] NSCP[idx].receive(t_NS_ALIVE_ACK);
-	[g_handle_rx_alive] as_rx_alive_tx_ack();
+	[g_handle_rx_alive] as_rx_alive_tx_ack(idx := idx);
 	[] NSCP[idx].receive { repeat; }
 	}
 }
@@ -125,7 +125,7 @@
 	[] NSCP[idx].receive(t_NS_ALIVE_ACK) {
 		setverdict(fail, "Received unexpected NS-ALIVE ACK");
 		}
-	[g_handle_rx_alive] as_rx_alive_tx_ack();
+	[g_handle_rx_alive] as_rx_alive_tx_ack(idx := idx);
 	[] NSCP[idx].receive { repeat; }
 	[] T.timeout {
 		setverdict(pass);
@@ -142,7 +142,7 @@
 	[] NSCP[idx].receive(ts_NS_RESET_ACK(g_nsconfig.nsvc[idx].nsvci, g_nsconfig.nsei)) {
 		setverdict(pass);
 		}
-	[g_handle_rx_alive] as_rx_alive_tx_ack();
+	[g_handle_rx_alive] as_rx_alive_tx_ack(idx := idx);
 	[] NSCP[idx].receive { repeat; }
 	[] T.timeout {
 		setverdict(fail, "Failed to receive a RESET ACK");
@@ -155,7 +155,7 @@
 	NSCP[idx].send(ts_NS_BLOCK(cause, g_nsconfig.nsvc[idx].nsvci));
 	alt {
 	[] NSCP[idx].receive(tr_NS_BLOCK_ACK(g_nsconfig.nsvc[idx].nsvci));
-	[g_handle_rx_alive] as_rx_alive_tx_ack();
+	[g_handle_rx_alive] as_rx_alive_tx_ack(idx := idx);
 	[] NSCP[idx].receive { repeat; }
 	}
 }
@@ -165,7 +165,7 @@
 	NSCP[idx].send(t_NS_UNBLOCK);
 	alt {
 	[] NSCP[idx].receive(t_NS_UNBLOCK_ACK);
-	[g_handle_rx_alive] as_rx_alive_tx_ack();
+	[g_handle_rx_alive] as_rx_alive_tx_ack(idx := idx);
 	[] NSCP[idx].receive { repeat; }
 	}
 }
@@ -205,7 +205,7 @@
 	[not exp_ack] T.timeout {
 		setverdict(pass);
 		}
-	[g_handle_rx_alive] as_rx_alive_tx_ack();
+	[g_handle_rx_alive] as_rx_alive_tx_ack(idx := idx);
 	[] NSCP[idx].receive { repeat; }
 	}
 }