Possible fix for weird issues with streaming