Navigation linking bug fix partial