Resolve UTF-8 issue