bug fix navigation