Bug fix for nav