Fix for GH unicode issue