Quick hacky fix to unicode conversion issues