BUGR-11338 - Navigation Issue