Fixed node name saving the first time