Fix of navigation