fixed UTF8 issues