diff --git a/tasks/download_files.yml b/tasks/download_files.yml
index 3272415..b6af256 100644
--- a/tasks/download_files.yml
+++ b/tasks/download_files.yml
@@ -10,7 +10,7 @@
 
 - name: Download files
   fetch:
-    src: "{{ item.path }}"
+    src: "{{ item.files }}"
     dest: "{{ download_folder }}"
-  with_items: "{{ download_set.files }}"
-  when: download_set.files | length > 0
+  with_items: "{{ download_set }}"
+  when: download_set | length > 0
diff --git a/tasks/main.yml b/tasks/main.yml
index 376234e..bf3f02f 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -22,9 +22,18 @@
   debug:
     msg: "Count Files Matched: {{ item.matched }}"
   with_items: "{{ downloads.results }}"
+#
+#- name: Iterate over files found
+#  include: download_files.yml
+#  with_items: downloads.results
+#  loop_control:
+#    loop_var: download_set
 
-- name: Iterate over files found
-  include: download_files.yml
-  with_items: downloads.results
-  loop_control:
-    loop_var: download_set
\ No newline at end of file
+- name: Download files
+  skip_missing: true
+  fetch:
+    src: "{{ item.1.files.path }}"
+    dest: "{{ download_folder }}"
+  with_subelements:
+  - "{{ downloads.results }}"
+  - files