fixed streaming support