 		var currentMediaStream : PluginMediaStream? = nil;
 
 		for (_, pluginMediaStream) in self.pluginMediaStreams {
-			if (pluginMediaStream.rtcMediaStream == stream) {
+			if (pluginMediaStream.rtcMediaStream.streamId == stream!.streamId) {
 				currentMediaStream = pluginMediaStream;
 				break;
 			}

		}

		self.onSetDescriptionFailureCallback = { (error: Error) -> Void in
			NSLog("PluginRTCPeerConnection#setLocalDescription() | failure callback: %@ description %@", 
						String(describing: error), desc)

			errback(error)


		let rtcMediaStreamTrack = pluginMediaTrack.rtcMediaStreamTrack;
		var rtcSender = trackIdsToSenders[rtcMediaStreamTrack.trackId];
		NSLog("PluginRTCPeerConnection#addTrack() trackId=%@ rtcId=%@ streamIds %@",
				pluginMediaTrack.id, rtcMediaStreamTrack.trackId, streamIds);
		if (rtcSender == nil) {
			rtcSender = self.rtcPeerConnection.add(rtcMediaStreamTrack, streamIds: streamIds)
