Fixing entities relations