Fix association generation