Add a way to fix relationships on demand