Richard
I believe we handled the above on an import a while back, but I'll need to reproduce the scenario you are describing on a deployment so we can work through it (if it still manifests.) I know you are in a rush for this so it is high on the priority list. I'll get back to you once I know more.
Thanks,
Dustin