fixing associations