Rewrite DownloadSourceFile - fixes #407