Account for multiple streams properly