Fix in NavigatorFactory