en/decoding fix