Missing reference
Fixed autoselection