Hotfix relationships

After (another) in dept review of relationships, here is the fix.