Autocomplete close #939