Prepayment match to CSPO and Invoice distribution account is showing Accrual account instead of char

Hello Gurus

We are creating Prepayments matched to CSPO.

CSPO is 3 way match with accrue at receipt set to Yes and advance set to 20%

Charge Account for advance is showing "11.Adavance.0000.0000.00'

Charge Account for non-advance is showing "11.CIP.0000.0000.00'

When we match prepayment Invoice to CSPO line 1 , shipment 0

Invoice distribution account is showing 11.Accrual.0000.0000.00 instead of "11.Adavance.0000.0000.00"

Oracle suggested we need to have custom solution for this

We are on 12.1.2

Thanks

Nilesh