unicode issue fix