Fix nagivation problem