Redundant set node calls fix