fixing ordering of choices