fix some error on handling node name