Fix in field mapping