Fix association reverting with uselist=False