Better support of nodes marked as removed when adding new ones