fix navigation state loss