diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index 0f8901fa9..7f706cc81 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -4146,9 +4146,9 @@ int linphone_core_get_calls_nb(const LinphoneCore *lc){
 **/
 bool_t linphone_core_can_we_add_call(LinphoneCore *lc)
 {
-	if(linphone_core_get_calls_nb(lc) < NB_MAX_CALLS)
+	if(linphone_core_get_calls_nb(lc) < lc->max_calls)
 		return TRUE;
-	ms_error("Maximum amount of simultaneous calls reached !");
+	ms_message("Maximum amount of simultaneous calls reached !");
 	return FALSE;
 }
 
diff --git a/mediastreamer2 b/mediastreamer2
index ba5d625fb..cb05f90c6 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit ba5d625fb8609f2af2487dd165d227641cd7b898
+Subproject commit cb05f90c60ea9e4d65dcb71dea6fbeca278c58ba