diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index d6a34880fb058f7b9ee3ccdec9ddd26cff2d1ebc..a01ca5606550e247c2fc80a551e4d9a9369e1d7c 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -4557,6 +4557,9 @@ module OneM2M_Functions {
 				} else if (v_cleanedURI == f_getResourceId(vc_localResourcesList[vc_cSEBaseIndex].resource)) {
 					log("Non Hierarchical method: " & v_cleanedURI);
 					v_resourceIndex := vc_cSEBaseIndex;
+				} else if (p_receivedURI == vc_localResourcesList[vc_cSEBaseIndex].resource.cSEBase.cSE_ID) {
+					log("Non Hierarchical method: " & p_receivedURI);
+					v_resourceIndex := vc_cSEBaseIndex;
 				}
 			}
 			log("Resource index found: " & int2str(v_resourceIndex));
@@ -5166,13 +5169,13 @@ module OneM2M_Functions {
 				}
     				
 			} else if (f_isScopeSpRelative(p_resourceAddress)){	
-				if(v_nbOfSlashes == 2 ) {
+				if((v_nbOfSlashes == 2 ) or (v_nbOfSlashes == 1 )) {
 					return true;
 				} else {
 					return false;
 				}
 			} else if (f_isScopeAbsolute(p_resourceAddress)){
-				if(v_nbOfSlashes == 4 ) {
+				if((v_nbOfSlashes == 4 ) or (v_nbOfSlashes == 3 )){
 					return true;
 				} else {
 					return false;
@@ -5678,8 +5681,8 @@ module OneM2M_Functions {
 			for (i := v_length - 1; i>=0; i := i-1){
 				if(p_resourceID[i]=="/"){
 					//log("result: " & result);
-					return result;
-				}
+						return result;
+						}
 				else{
 					result := p_resourceID[i] & result;
 				}