fixed wrong association