Fix in field count