diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index 95b9e7a59401a8e8a8082b38bed83626e8df9802..201193a0b50b53f7e4fc65d9d373a82d95930ace 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -1441,7 +1441,11 @@ module OneM2M_Functions {
 			var template AcpType v_defaultAcpIDs := {"NotInitialized"};
 
 			if(p_resourceType != int2) {
-				p_request.from_ := f_getOriginator(p_parentIndex);
+				if(p_resourceType == int16) {
+					p_request.from_ := f_getOriginator(p_parentIndex, false);
+				} else {				
+					p_request.from_ := f_getOriginator(p_parentIndex);
+				}
 			}
 			p_request.to_ := f_getResourceAddress(p_parentIndex);