Proper fix for #310

Too many tasks at the same time, but this time fixed, for real.
Merge pull request #320 from TheSerapher/issue-310

Proper fix for #310