Navigation fix
Merge branch 'hotfix/Navhelper'