bug fix autocompletion