fix streaming message behavior