Fix overwriting associations