Fixed field mapping again.