Updated to fix download (taken from @advanced)