Fix: ComboBox Beta