nav bugfix
Merge branch 'hotfix/navbug' into develop