Fix #994

Navigator didn't update correctly in some case
Merge pull request #995 from matheod/fixNavigator

Fix #994