Fixed duplicate node_terminus issue and tested in 3.3.X