corrected auto-select