diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index 992b9c4c88a0e503f70d991698671ee5945add1e..3ac2991d9ff8d486ca48a126fed3b4b675fcbbc7 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -3412,9 +3412,9 @@ module OneM2M_Functions {
 			} else if (p_primitiveScope ==  e_absolute) {
 				if(p_addressingMethod == e_nonHierarchical) {
 					if(p_targetResourceIndex == -1) {
-						return PX_SP_ID & PX_CSE_ID;
+						return PX_SP_ID & PX_CSE_ID & "/" & PX_CSE_RESOURCE_ID;
 					} else {
-						v_resourceAddress := f_getResourceAddress(-, p_addressingMethod, p_primitiveScope) & "/" & f_getResourceId(vc_resourcesList[p_targetResourceIndex].resource);
+						v_resourceAddress := PX_SP_ID & PX_CSE_ID & "/" & f_getResourceId(vc_resourcesList[p_targetResourceIndex].resource);
 						return v_resourceAddress;
 					}
 				} else {
@@ -3476,9 +3476,9 @@ module OneM2M_Functions {
 			} else if (p_primitiveScope ==  e_absolute) {
 				if(p_addressingMethod == e_nonHierarchical) {
 					if(p_targetResourceIndex == 0) {
-						return PX_SP1_ID & PX_CSE1_ID;
+						return PX_SP1_ID & PX_CSE1_ID & "/" & PX_CSE1_RESOURCE_ID;
 					} else {
-						v_resourceAddress := f_getLocalResourceAddress(-, p_addressingMethod, p_primitiveScope) & "/" & f_getResourceId(vc_localResourcesList[p_targetResourceIndex].resource);
+						v_resourceAddress := PX_SP1_ID & PX_CSE1_ID & "/" & f_getResourceId(vc_localResourcesList[p_targetResourceIndex].resource);
 						return v_resourceAddress;
 					}
 				} else {