Fixing autocompletion