last fix for stream