Bug fix to navigation