task queue bugfixes #3