Fix field mapping.