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


		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)

		var currentMediaStreamTrack : PluginMediaStreamTrack? = nil;

		for (_, pluginMediaTrack) in self.pluginMediaTracks {
			if (pluginMediaTrack.rtcMediaStreamTrack.trackId == rtpReceiver.track!.trackId) {
				currentMediaStreamTrack = pluginMediaTrack;
				break;
			}
