Make sure old holder is re-added only after assigning it