Fix for UTF-8 encoding issues.

Not sure if UTF-8 is still an issue. See my commit comment for more info.