added check for aggregated fields