Fix task running twice in parallel
Merge pull request #633 from dswd/fix_tasks

Fix task running twice in parallel