possible streaming fix