Attempt to fix the Encoding issue