Fix Streaming (Untested but currently way was absolutly wrong)