Fix major bug on streamer

Fix major bug on streamer