Fix association