Fix unmark task as current on completion