diff --git a/OneM2M_PermutationFunctions.ttcn b/OneM2M_PermutationFunctions.ttcn
index b89e13e6ecd5635390b807df2cbaa54ce1f5256c..9fe0d9fa8084e57097e9ec2a1603869205f8e14f 100644
--- a/OneM2M_PermutationFunctions.ttcn
+++ b/OneM2M_PermutationFunctions.ttcn
@@ -2777,6 +2777,9 @@ module OneM2M_PermutationFunctions {
 						v_request.requestIdentifier := "Existing resource";
 						
 						if(p_resourceType == int23){
+							if(vc_ae2.running) {
+								f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
+							}
 							vc_ae2.start(f_cse_notifyProcedure_subscriptionVerificationHandler());
 						}
     					
@@ -4244,7 +4247,6 @@ module OneM2M_PermutationFunctions {
 						var integer v_aeIndex := -1;
 						var integer v_resourceIndex := -1;
 						var integer v_ae2Index := -1;
-						var integer v_acpIndex := -1;
 												    										   
 						// Test control
     				
@@ -4269,7 +4271,7 @@ module OneM2M_PermutationFunctions {
 							
 							f_cse_createAccessControlPolicyAux(-, -, -);
 						
-							p_requestPrimitive := f_setAcpId(p_requestPrimitive, {vc_resourcesList[v_acpIndex].resource.accessControlPolicy.resourceID});
+							p_requestPrimitive := f_setAcpId(p_requestPrimitive, {vc_resourcesList[vc_acpIndex].resource.accessControlPolicy.resourceID});
 						}
 						if (p_resourceType!=int16){	//ResourceType != RemoteCSE