A fix for the encoding issue, finally.