Hotfix: keep checking for task done
Merge branch 'hotfix/0.2.19.2'