Fix field mapping