Another fix for UTF-8 encoding