Fixing navigation bug

Fixing navigation bug