Fix UTF-8 issue