diff --git a/OneM2M_PermutationFunctions.ttcn b/OneM2M_PermutationFunctions.ttcn
index 6861146bb302b39b9f637cdd621338cd023c9435..07969775947ea6bbf4e6ab2addb5b0f2033e4d0d 100644
--- a/OneM2M_PermutationFunctions.ttcn
+++ b/OneM2M_PermutationFunctions.ttcn
@@ -8763,6 +8763,7 @@ module OneM2M_PermutationFunctions {
 						if (ischosen(v_response.primitive.responsePrimitive.primitiveContent.uRI)){
 							v_contentResponseRequestResource.request := mw_contentRequestBase;
 							v_requestResourceURI := v_response.primitive.responsePrimitive.primitiveContent.uRI;
+							v_contentResponseRequestResource.request.primitiveContent := p_requestPrimitive.primitiveContent;
 							if (p_operation == int1){		//create
 								v_statusCode := int2001;
 								v_primitiveContent := f_getTemplateFromPrimitiveContent(p_requestPrimitive.primitiveContent);
@@ -8774,8 +8775,7 @@ module OneM2M_PermutationFunctions {
 								v_primitiveContent := f_getTemplateFromPrimitiveContent(p_requestPrimitive.primitiveContent);
 							}else if (p_operation == int4){	//delete
 								v_statusCode := int2002;
-								v_primitiveContent.container := mw_contentContainer_rc1;
-								//v_primitiveContent := omit;
+								v_primitiveContent := omit;
 							}
 							f_send(e_mca_port, m_request(m_retrieve(v_requestResourceURI, f_getOriginator(v_aeIndex))));
 							tc_ac.start;
@@ -9199,7 +9199,7 @@ module OneM2M_PermutationFunctions {
 						
 						f_cse_notifyProcedure_responsePrimitiveHandler(mw_responsePrimitive(p_responseStatusCode));
 						
-						vc_ae2.done;
+						f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
 	
 						// Postamble
 						f_cse_postamble_deleteResources();