Fixed UTF8 support