fixing auto-completion