Added manual association fix