Fix association bug