CIS Deductions Suffered & P30

Currently, when a client has "CIS deduction suffered", the P30 that is included within the Pay Run Automation emails is showing the wrong "Due to be Paid" figures as any amounts that are entered for CIS deductions suffered are NOT automatically included on the P30. I have been advised that the P30 will never show the correct figure as the only way to reduce the amount due by the CIS deductions suffered is to enter the amount manually onto the "HMRC Payments" after the payrun has been finalised! This has resulted in some of our clients paying over to HMRC incorrect amounts! I appreciate that we could run the P30 after the run has been finalised but this then means that the P30 would have to be excluded from the automation and not passworded.

Can this please be implemented to stop further errors and payments to HMRC