Fix for stream break (hopefully)