fix broken associations
fix broken associations