Fix navigator bug