Fix decoding issue per bug 732336