fix numbering of single copied nodes
Merge branch '1.2.x' into 1.3.x