Improve the encoding, making it more resilient.