latest version with autocomplete fix