Hotfix/end of stream