diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index 4a53af22a4e85a9db761065d319a074ca501107f..df4133eb1374da718ecec54fe469fc25d0163973 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -4600,19 +4600,7 @@ module OneM2M_Functions {
 			
 			return v_poa;
 		}
-		
-		function f_getPortAddress(in PortDesc p_portDesc := PX_TS_CSE1.mcaPortIn) return charstring {
-      if (ischosen(p_portDesc.binding.httpBindingDesc)) {
-        return p_portDesc.binding.httpBindingDesc.bindingDesc.tsAddress;
-      } else if (ischosen(p_portDesc.binding.coapBindingDesc)) {
-        return p_portDesc.binding.coapBindingDesc.bindingDesc.tsAddress;
-      } else if (ischosen(p_portDesc.binding.mqttBindingDesc)) {
-        return p_portDesc.binding.mqttBindingDesc.bindingDesc.tsAddress;
-      } else {
-        return p_portDesc.binding.wsBindingDesc.bindingDesc.tsAddress;
-      }
-		}
-		
+				
 		/**
 		 * @desc Resolution of the local resource index for a given resource address (URI)
 		 * @param p_address	Resource URI (can be structured/unstructured cseRelative/spRelative/absolute)
diff --git a/OneM2M_PermutationFunctions.ttcn b/OneM2M_PermutationFunctions.ttcn
index 2e7dcb2af03a8ac2723c6139d2c2e59a5a8d615d..fc08381f29c2d11491949720e3d4a23015539dfd 100644
--- a/OneM2M_PermutationFunctions.ttcn
+++ b/OneM2M_PermutationFunctions.ttcn
@@ -2277,7 +2277,7 @@ module OneM2M_PermutationFunctions {
 						var RequestPrimitive v_request;
 						var ResourceType v_resourceType := int16;	//remoteCSE
 						var template UtTriggerPrimitive v_utRequest := m_utCreateRemoteCSE;
-						var universal charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request containing To set to " & f_getPortAddress(PX_TS_CSE1.mccPortIn) & " and Content containing remoteCSE resource containing a valid attribute " & p_attribute[0]; // Test control
+						var universal charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request containing To set to " & f_getLocalResourceAddress() & " and Content containing remoteCSE resource containing a valid attribute " & p_attribute[0]; // Test control
 						if(not(PICS_MN_CSE)) {
 							setverdict(inconc, __SCOPE__ & ": IUT shall be MN-CSE to run this test case");
 							stop;