Fixed Unexpected nav behavior (EVII-3)