NOJIRA fix navigation issue