Quick fix to nav bug