diff --git a/coreapi/callbacks.c b/coreapi/callbacks.c
index 046f7edb5..bce577773 100644
--- a/coreapi/callbacks.c
+++ b/coreapi/callbacks.c
@@ -49,7 +49,9 @@ void linphone_core_update_streams(LinphoneCore *lc, LinphoneCall *call, SalMedia
 		/* we already started media: check if we really need to restart it*/
 		if (oldmd){
 			if (!media_parameters_changed(call,oldmd,new_md) && !call->playing_ringbacktone){
-				sal_media_description_unref(oldmd);
+				/*as nothing has changed, keep the oldmd */
+				call->resultdesc=oldmd;
+				sal_media_description_unref(new_md);
 				if (call->all_muted){
 					ms_message("Early media finished, unmuting inputs...");
 					/*we were in early media, now we want to enable real media */
diff --git a/coreapi/offeranswer.c b/coreapi/offeranswer.c
index 5748a6d5b..34d21fc0f 100644
--- a/coreapi/offeranswer.c
+++ b/coreapi/offeranswer.c
@@ -96,7 +96,7 @@ static MSList *match_payloads(const MSList *local, const MSList *remote, bool_t
 				 Indeed despite we must sent with the remote numbering, we must be able to receive with
 				 our local one.
 				*/
-				newp=payload_type_clone(matched);
+				newp=payload_type_clone(newp);
 				payload_type_set_number(newp,local_number);
 				res=ms_list_append(res,newp);
 			}
diff --git a/mediastreamer2 b/mediastreamer2
index 285b4e9c7..3c348bc98 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 285b4e9c790f34a4cc1087af72425290c532c1df
+Subproject commit 3c348bc98e990f0819b972a8b04d80da2d6d0d77