Fixed ChoiceBox items/value sync