ComboBox issue fixed