correct all the associations