Fix bug with finding task after complete