Fix for UTF-8 encoding issues.