fixed the issue with tasks