Fix field mapping for fake fields