Fix weird decoding situations