Fixing issue with unsupported UTF-8 characters