Fix model for navigator