Combobox bug fix