Correct UTF-8 encoding issues