Fix issue with tasks executing