partial bugfix on stream stuff