Fix Dropdown --> ComboBox