Fixed Encoding issue