- Fix bug with streams