diff --git a/library/SMPP_Emulation.ttcn b/library/SMPP_Emulation.ttcn
index fdeed4b..6c808eb 100644
--- a/library/SMPP_Emulation.ttcn
+++ b/library/SMPP_Emulation.ttcn
@@ -362,6 +362,17 @@
 private function f_create_expect(charstring dest_number, SMPP_ConnHdlr hdlr)
 runs on SMPP_Emulation_CT {
 	for (var integer i := 0; i < sizeof(ExpectTable); i := i+1) {
+		if (ExpectTable[i].dst_addr == dest_number) {
+			ExpectTable[i] := {
+				dst_ton := omit,
+				dst_npi := omit,
+				dst_addr := dest_number,
+				vc_conn := hdlr
+			}
+			return;
+		}
+	}
+	for (var integer i := 0; i < sizeof(ExpectTable); i := i+1) {
 		if (ExpectTable[i].vc_conn == null) {
 			ExpectTable[i] := {
 				dst_ton := omit,