Resolved unicode issue