In some instances, the B2C user's Billing address was being overwritten by the pickup store's address when pickup was selected. This has been fixed.