fixed some streaming problem