Fix auto complete