Another attempt to fix unicode encoding issue, based on my fix from other repo which was tested to work