fix utf-8 issues