bugfix/workaround for 22
Merge branch 'master' of https://github.com/fischerdom/tasking