fixing navigation issue