Make data transfer more robust