NS fix leaf nodes problem