WIP - fix another stream problem