re fixed a possible navigatino bug