Fixing UTF-8 compatibility