Fix for aggregates