Fix Node Discovery