Stream fix again