Fix non-us character encoding issue