bugfix on navigation