fix navigation BUG