Fix navigator