More robust uploading. v1.3.4