[Fix] - Avoid the duplicated tasks