fix navigation issue