Fix aggregate