Additional fix to be able to build tree of unfinished tasks