Fixed bug with new streams