This bug is so obvious its painful. Fix stream breakage