Fix remote download forever... hopefully