Fixing field mapping