fix streaming issue