diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index 6d2922d37..b0eca26a8 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -6437,7 +6437,7 @@ static void linphone_core_uninit(LinphoneCore *lc)
 	if (lc->supported_formats) ms_free(lc->supported_formats);
 	linphone_core_message_storage_close(lc);
 	linphone_core_call_log_storage_close(lc);
-	//ms_exit();
+	
 	ms_factory_uninit_voip(lc->factory);
 	ms_factory_uninit_plugins(lc->factory);
 	ms_factory_destroy(lc->factory);
diff --git a/mediastreamer2 b/mediastreamer2
index a93ad5074..816450630 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit a93ad507480abdc363f4c3a9d4c2dacf90ce8028
+Subproject commit 816450630d8c9fdc7e2591f43d47c6807d3fff16