Fix associated objects