fix ChoiceType