fixed autocompletion