Changed the location of the checking/setting of the missing dayOfAggregation.