DecoderException fix