bug fix in Nav class
branch merge