Nav bug fix