Resolve encoding issue