partially fix streaming