added field checking