Return with Freight Charge Creates 2 Credit Memos

We have a situation where Returns with Freight charges and resulting in 2 credit memos being generated.  One CM includes lines with items, and the second CM only includes Freight Lines (coming from the charges returned).

How can we get it to stay together and produce 1 CM only?  We noticed that if we uncheck 'Allow Overapplication' then it fails in Autoinvoice Import.  It will produce errors = 1)  The total amount of your credit memo cannot exceed the balance of the debit item it is crediting.  2)  You can not apply more than the original line amount.  3)  You cannot apply a transaction with a negative amount to another transaction with a negative balance and vice versa.