Fix to navigation