NavigationTree fix