Fix for removal of downloader