Fix CHOICE decoding