partially fixed problem navigation