Fix relationship for 3.0