diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn
index 9db18d3..f99f93c 100644
--- a/msc/MSC_Tests.ttcn
+++ b/msc/MSC_Tests.ttcn
@@ -5778,6 +5778,10 @@
 	f_perform_lu();
 	f_mo_call_establish(cpars);
 
+	/* Remember the last n_sd (sequence number),
+	 * we will need it when the other BSS hands over back to us. */
+	var N_Sd_Array last_n_sd := f_bssmap_last_n_sd();
+
 	f_sleep(1.0);
 
 	var default ack_mdcx := activate(as_mgcp_ack_all_mdcx(cpars));
@@ -5854,13 +5858,11 @@
 
 	deactivate(ack_mdcx);
 
-	var default ccrel := activate(as_optional_cc_rel(cpars, true));
-
-	/* blatant cheating */
-	var N_Sd_Array last_n_sd := f_bssmap_last_n_sd();
-	last_n_sd[0] := 3;
+	/* Use the n_sd (sequence number) we stored before the first handover.
+	 * Otherwise the MSC may treat our DTAP messages as duplicates and discard them. */
 	f_bssmap_continue_after_n_sd(last_n_sd);
 
+	var default ccrel := activate(as_optional_cc_rel(cpars, true));
 	f_call_hangup(cpars, true);
 	f_sleep(1.0);
 	deactivate(ccrel);