Navigation bug fix