Fix loading of tasks
Merge pull request #635 from onepercentclub/feature/fix-loading-of-tasks

Feature/fix loading of tasks