Decoding fix