BUGFIX: Fix to prevent nesting errors for completed tasks