Fix Combobox selection