Added download fix from upstream