NavigationController bug fix tentative