make download more defensible for 1.8.7