fix up stream