AutoComplete Fix