One more fix to suit compiling (AggrigationCalculator)