diff --git a/remount.yml b/remount.yml
index 74d3539..deeb4a9 100644
--- a/remount.yml
+++ b/remount.yml
@@ -9,12 +9,12 @@
   tasks:
   - name: remount filesystems
     command:
-      mount -oremount,{{ remount_state }} {{ item }}
+      mount -oremount,{{ remount_state }} {{ item.mount }}
       warn=false
     with_items: >-
       {{
       ansible_mounts
          | selectattr('mount', 'in', remount_fs)
-         | map(attribute='mount')
          | list
       }}
+    when: not item.options.startswith(remount_state)