fix user completion issue