Fix encoding issues with some characters