Fix #994

Navigator didn't update correctly in some case