Fix custom aggregators