EmirH: fixing navigation