Proper fix for #310

Too many tasks at the same time, but this time fixed, for real.