Fix bug with duplicate stream starting