Fixed UTF-8 support