How to fix a broken neighborhood