fix associations