fixing navigation
(cherry picked from commit 0a682760addcc31c8ce2f89aa1dbc45dc78c27f4)