Fixing Encoding issue