better checking of fields