Fix autocompletion