ComboBoxX: fixed regression 22572/20945