Autocompletion fix