Bug fix for more than tasks