diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index 872bb02a9dd73b7b6120e263f30d914998b582a2..8c56a990f60e51c6e56fbc7d864600a1b494b7fc 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -189,7 +189,7 @@ module OneM2M_Functions {
 				map(self:utPort, system:utPort);
 			}
 			activate(a_default());
-			activate(a_ae_cf03());
+			vc_a_ae_cf03 := activate(a_ae_cf03());
 		
 			// Connect
 					
@@ -3532,6 +3532,7 @@ module OneM2M_Functions {
 				p_utRequest.from_ := "UNINITIALIZED";
 				p_utRequest.requestIdentifier := "m_uttriggerPrimitive" & f_rnd(1, 1000000);
 
+				deactivate(vc_a_ae_cf03);
 				utPort.send(valueof(p_utRequest));
 
 				tc_wait.start;
@@ -3548,6 +3549,7 @@ module OneM2M_Functions {
 						setverdict(inconc, __SCOPE__, " : Timeout due to no response received from requested SUT!");
 					}
 				}
+				vc_a_ae_cf03 := activate(a_ae_cf03());
 			
 			}else{
 				
diff --git a/LibOneM2M/OneM2M_TestSystem.ttcn b/LibOneM2M/OneM2M_TestSystem.ttcn
index 223b9fdd45942755553b26b571304448b9b0d3de..99c08aa9c504d98861d5cf51e51b4458f5ff2ae3 100644
--- a/LibOneM2M/OneM2M_TestSystem.ttcn
+++ b/LibOneM2M/OneM2M_TestSystem.ttcn
@@ -39,6 +39,7 @@ module OneM2M_TestSystem {
 		var AccessControlPolicy_optional vc_acpAux;
 		var MsgIn vc_request;
 		var MsgIn vc_response;
+		var default vc_a_ae_cf03;
 	};
 	
 	type component AeSimu extends Tester {