Removed calc_num task properly
Merged from calc_num_task_fix