More robust downloading