Bugfix fixed navigation