Fix association mapping