Fixed duplicate execution of Tasks