added fix for streaming stop