fix'ed autocomplete issue