Tasks are now ordered correctly