Combobox fix