Fixed combobox bug