Fix - Fix Relationships inconsistency