BUG: Trying to fix stream interupts