diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index e42e68680c49ce9512dcdff7437ffd7a16037503..fabe4195f95b98a088e388cd5c1858f81625acd3 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -332,7 +332,8 @@ module OneM2M_Functions {
 				[]infoPort.receive(mw_responsePrimitiveforInfoPort) -> value v_response {
 				}
 			}
-	
+			
+			p_component.done;
 			f_disconnectInfoPort(p_component);
 				
 			return v_response;
@@ -354,6 +355,7 @@ module OneM2M_Functions {
 				}
 			}
 
+			p_component.done;
 			f_disconnectInfoPort(p_component);
 	
 			return v_request;
@@ -375,6 +377,7 @@ module OneM2M_Functions {
 				}
 			}
 	
+			p_ae.done;
 			f_disconnectInfoPort(p_ae);
 				
 			return v_primitiveContent;
@@ -398,6 +401,7 @@ module OneM2M_Functions {
 				}
 			}
 	
+			p_cse.done;
 			f_disconnectInfoPort(p_cse);
 				
 			return v_resourceIndex;
@@ -422,6 +426,7 @@ module OneM2M_Functions {
 				}
 			}
 
+			p_component.done;
 			f_disconnectInfoPort(p_component);
 			
 			return v_resourceIndex;