Deal with some more edge cases
Merge branch 'playing_with_tasks' into develop