Fix vendor field too.