[BUGFIX] Corrected autocompletion