diff --git a/tasks/htpasswd.yml b/tasks/htpasswd.yml
index 4dccc07..72ffe35 100644
--- a/tasks/htpasswd.yml
+++ b/tasks/htpasswd.yml
@@ -14,6 +14,6 @@
     password: "{{ item.1.password }}"
     state: "{{ item.1.state | default('present') }}"
     path: "{{ nginx_htpasswd_dir }}/{{ item.0.name }}"
-  loop: "{{ nginx_htpasswd | subelements(users) }}"
+  loop: "{{ nginx_htpasswd | subelements('users') }}"
   when: item.0.state is not defined or item.0.state == 'present'
   no_log: not nginx_debug_role
diff --git a/tasks/site.yml b/tasks/site.yml
index 39f3792..9529ce3 100644
--- a/tasks/site.yml
+++ b/tasks/site.yml
@@ -53,9 +53,11 @@
   file:
     path: "{{ nginx_etc_dir }}/{{ item.1 }}/{{ item.0 | nginx_site_filename }}"
     state: absent
-  loop: "{{ nginx_sites | product(['sites-available', 'sites-enabled']) }}"
+  loop: "{{ nginx_sites | product(dirs) | list }}"
   notify: ['reload nginx', 'restart nginx freebsd']
   when: item.0.state is defined and item.0.state == 'absent'
+  vars:
+    dirs: ['sites-available', 'sites-enabled']
   loop_control:
     label: "{{ nginx_etc_dir }}/{{ item.1 }}/{{ item.0 | nginx_site_filename }}"