issue #167 | Fix aggregators