fix associations for the last TIME OMG!