PO MATCHED INVOICE CALCULATE EXCLUSIVE TAX DESPITE INCLUSIVE SETUP

We have defined tax rate inclusive of tax amount. When PO is created , system considers inclusive tax for the line amount.

However, when we are matching PO to invoice in Payable, system is again calculating tax as exclusive although we have set inclusive tax option. Due to this, our tax calculation is wrong.

I have read in oracle support note, that PO matched invoice always calculate Exclusive tax rate regardless of Tax inclusive setup done at tax rate level.

Please advise.  What is the workaround, as we need to use inclusive tax option.

Regards,