Added corrections to when execute tasks