Fixing navigation jump