Fixed issue with multiplexing and streams