UTF-8 issue fixed