Bugfix for running without aggregation