diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn
index 6f8078b..75eb892 100644
--- a/msc/BSC_ConnectionHandler.ttcn
+++ b/msc/BSC_ConnectionHandler.ttcn
@@ -1357,15 +1357,20 @@
 	log("f_mt_call_complete DONE");
 }
 
-function f_expect_paging(boolean by_tmsi := true)
+function f_expect_paging_tmsi(template OCT4 tmsi := *)
 runs on BSC_ConnHdlr {
 	if (g_pars.ran_is_geran) {
-		BSSAP.receive(tr_BSSMAP_Paging(g_pars.imsi));
+		BSSAP.receive(tr_BSSMAP_Paging(g_pars.imsi, tmsi));
 	} else {
 		BSSAP.receive(tr_RANAP_Paging(cs_domain, imsi_hex2oct(g_pars.imsi)));
 	}
 }
 
+function f_expect_paging()
+runs on BSC_ConnHdlr {
+	f_expect_paging_tmsi(g_pars.tmsi);
+}
+
 function f_mt_call_establish(inout CallParameters cpars)
 runs on BSC_ConnHdlr {