Attempt to fix AutoComplete