Fix due to aggregate changes.