Improve TaskCompletion recalculation