fixed utf-8 issues