Patches to stop uploading twice