MarketPress Shipping and Billing address swapped during PayPal Payment


We are using MarketPress and when we purchase an item with a different billing and shipping address, and have it processed by PayPal, the two addresses get swapped so the billing address is displayed as the shipping address and the shipping address is displayed as the billing address.

Is there a fix for this?