Fix encoding of CHOICE