Fix aggregate handling for cascade deleted objects