Partial fix to "inconsistent dowload state" issue.