make streamer more bulletproof