fixed streaming issues