diff --git a/mgw/MGCP_Test.ttcn b/mgw/MGCP_Test.ttcn
index 77eed4b..0de5308 100644
--- a/mgw/MGCP_Test.ttcn
+++ b/mgw/MGCP_Test.ttcn
@@ -1420,7 +1420,11 @@
 		f_init();
 
 		for (ep_nr := 1; ep_nr < 30; ep_nr := ep_nr+1) {
-			ep := c_mgw_ep_rtpbridge & hex2str(int2hex(ep_nr, 2)) & "@" & c_mgw_domain;
+			if(ep_nr > 15) {
+				ep := c_mgw_ep_rtpbridge & hex2str(int2hex(ep_nr, 2)) & "@" & c_mgw_domain;
+			} else {
+				ep := c_mgw_ep_rtpbridge & hex2str(int2hex(ep_nr, 1)) & "@" & c_mgw_domain;
+			}
 			call_id := int2hex(ep_nr, 2) & '1234'H;
 			f_crcx_and_dlcx_ep_callid_connid(ep, call_id);
 		}