Fixing streaming, fixes #144

Fixes #144