ComboBox fix