Fixing an encoding ISSUE