Added fix for endless recursion in collecting downloads