diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn
index c3426a4..4e736b8 100644
--- a/msc/BSC_ConnectionHandler.ttcn
+++ b/msc/BSC_ConnectionHandler.ttcn
@@ -1066,8 +1066,10 @@
 
 
 	if (g_pars.ran_is_geran) {
-		var template BSSMAP_IE_AoIP_TransportLayerAddress tla_ass :=
+		var template BSSMAP_IE_AoIP_TransportLayerAddress tla_ass1 :=
 			f_tr_BSSMAP_IE_AoIP_TLA(cpars.mgw_conn_1.mgw_rtp_ip, ?);
+		var template BSSMAP_IE_AoIP_TransportLayerAddress tla_ass2 :=
+			f_tr_BSSMAP_IE_AoIP_TLA(cpars.mgw_conn_2.mgw_rtp_ip, ?);
 
 		interleave {
 		/* Second MGCP CRCX (this time for MSS/CN side) */
@@ -1084,7 +1086,7 @@
 			}
 
 		/* expect the MSC to trigger a BSSMAP ASSIGNMENT */
-		[] BSSAP.receive(tr_BSSMAP_AssignmentReq(omit, tla_ass)) -> value bssap {
+		[] BSSAP.receive(tr_BSSMAP_AssignmentReq(omit, (tla_ass1, tla_ass2))) -> value bssap {
 			var template BSSMAP_IE_AoIP_TransportLayerAddress tla;
 			var BSSMAP_IE_SpeechCodec codec;
 			var BSSMAP_IE_Osmo_OsmuxCID osmuxCID;
@@ -1486,8 +1488,10 @@
 		return;
 	}
 
-	var template BSSMAP_IE_AoIP_TransportLayerAddress tla_ass :=
+	var template BSSMAP_IE_AoIP_TransportLayerAddress tla_ass1 :=
 		f_tr_BSSMAP_IE_AoIP_TLA(cpars.mgw_conn_1.mgw_rtp_ip, ?);
+	var template BSSMAP_IE_AoIP_TransportLayerAddress tla_ass2 :=
+		f_tr_BSSMAP_IE_AoIP_TLA(cpars.mgw_conn_2.mgw_rtp_ip, ?);
 
 	var default mdcx := activate(as_optional_mgcp_mdcx(cpars.mgw_conn_2.mgw_rtp_ip, cpars.mgw_conn_2.mgw_rtp_port));
 	var boolean got_mncc_setup_compl_ind := false;
@@ -1533,8 +1537,9 @@
 		var BSSMAP_IE_SpeechCodec codec;
 		var BSSMAP_IE_Osmo_OsmuxCID osmuxCID;
 
-		if (not match(bssap.pdu.bssmap.assignmentRequest.aoIPTransportLayer, tla_ass)) {
-			log("Expected:", tla_ass);
+		if (not match(bssap.pdu.bssmap.assignmentRequest.aoIPTransportLayer, tla_ass1)
+		    and not match(bssap.pdu.bssmap.assignmentRequest.aoIPTransportLayer, tla_ass2)) {
+			log("Expected one of: 1:", tla_ass1, " 2:", tla_ass2);
 			log("Got:", bssap.pdu.bssmap.assignmentRequest.aoIPTransportLayer);
 			setverdict(fail, "MSC sent Assignment Request with unexpected AoIP Transport Layer IE");
 			mtc.stop;