Fix for streamMaker