Better social graph fix