Fix ChoiceMenu (2)