Problem with 5.2 Quote Contacts

I'm on 5.2. With 5.2, you can now specify a different ship-to on the quote.
When you then pick a customer contact, you can choose contacts from the
quote bill-to or quote ship-to. This is good. HOWEVER, the problem is, if
I choose my primary quote contact from the ship-to, that contact appears
correctly on the screen in vantage, but if I then preview the quote, the
contact name is wrong. It appears that it is not linking correctly thru the
ship-to and it is giving me the contact from the main bill-to customer's
list of customer contacts which corresponds to the vantage assigned contact
# for the ship-to customer selected. Has anyone else seen this or developed
a work around?