Fix neighbors