Fix  encoding character issue