fix for autoselect issue
merge