actually, now that the nonce changes on rebind (last patch), this shouldn't be a problem any more... we can move it after.