Material freight document shows incorrect sales order line item

When a sales order has multi line items, the material freight document shows the same line item for all the lines.

For example,

Sales order 1234 has line item 10 and line item 20.

Shipment costing is completed and PO is automatically created for service agent.

Material freight document line item 1 shows sales order 1234 line item 10. Line item 2 shows sales order 1234 line item 10. The material freight line item 2 should be line item 20.

Purpose of this is that I want to be able to track freight accrual back to the sales order line item (material) or the delivery line item for reporting.

Thank you,

Bela