Use upstream fix for decoding