RC: #13 fixed nav issue