diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index a9b019a0e7ad70659b5e6d4714d735a3c70c3da2..8474ae2d1222ed061b31bfde02df58518b944496 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -1439,7 +1439,11 @@ module OneM2M_Functions {
 							vc_cse1.stop;
 						}
 						if(vc_cse1.alive) {
-							vc_cse1.start(f_cse_defaultHandler());
+							f_connectInfoPort(vc_cse1);
+							f_cse_postamble_cse1();
+							f_cse_defaultHandler_aeSimu();
+							f_disconnectInfoPort(vc_cse1);
+				
 						}
 					}
 					
@@ -1470,15 +1474,6 @@ module OneM2M_Functions {
 						
 					}
 					
-					if(vc_config == e_cf02) {
-						if(vc_cse1.running) {
-							f_sendSyncPoint(e_done, vc_cse1);
-						}
-						vc_cse1.done;
-						if(vc_cse1.alive) {
-							f_cse_postamble_cse1();
-						}
-					}
 				}
 			
 			}
@@ -1630,6 +1625,12 @@ module OneM2M_Functions {
 						}
 					}					
 				}
+				
+				if(vc_config == e_cf02) {
+					if(infoPort.checkstate("Connected")) {
+						infoPort.send(SyncPoints:e_done);
+					}
+				}
 			
 			}			
 			
@@ -2796,6 +2797,25 @@ module OneM2M_Functions {
 			
 				}// end f_cse_defaultHandler
 			
+			/**
+			 * @desc Activate default for AeSimu
+			 */
+			function f_cse_defaultHandler_aeSimu() runs on AeSimu {
+				
+					//Activate defaults when running on a PTC
+					f_cse_activateDefaults_ae();	
+					
+					tc_ac.start;
+					alt {
+						[] infoPort.receive(OneM2M_TypesAndValues.SyncPoints:e_done) {
+							log(__SCOPE__, "Peer component done")
+						}
+						[] tc_ac.timeout {
+						}
+					}
+			
+				}// end f_cse_defaultHandler_aeSimu
+			
 			/**
 			 * @desc Creation of a local resource
 			 * @param p_resourceType Resource type of the resource to be created