Improve re-entering of tasks