Stepping away from PropertyDecider.
Fixed double insertion of certain nodes.