fixing autoselection