fix #45: Navigator change