Fix a merge issue with DataCalcJob