I hope that when you do that, your remaining problems with the transfer will be solved automatically as a side effect to improving the protocol.