Fixed NavigationBug