Fix relationship loop