diff --git a/OneM2M_PermutationFunctions.ttcn b/OneM2M_PermutationFunctions.ttcn
index a7af3e81ce2a27274dfd900fe2309a65aefc25c2..25a034c8bf9f49a2f1dc8213f8b21a41ad87c829 100644
--- a/OneM2M_PermutationFunctions.ttcn
+++ b/OneM2M_PermutationFunctions.ttcn
@@ -5498,10 +5498,14 @@ module OneM2M_PermutationFunctions {
 						// Preamble
 						v_acpAuxIndex := f_cse_preamble_createAcpAux(-, int59);//c_CRDNDi)
 						
-						v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)}, -);//c_CRDNDi);
+						v_aeIndex := f_cse_preamble_registerAe(-, -);
 						
 						f_cse_preamble_subscriptionVerification(v_ae2Index, p_createRequestPrimitive, p_resourceType);
 						
+						if(p_resourceType != int1) {
+							p_createRequestPrimitive := f_setAcpId(p_createRequestPrimitive,{f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)});//c_CRDNDi);
+						}
+						
 						v_resourceIndex := f_cse_createResource(p_resourceType, p_createRequestPrimitive, v_aeIndex); 				
 																
 						// Test Body