diff --git a/roles/fvs-client-mkhome/tasks/main.yml b/roles/fvs-client-mkhome/tasks/main.yml
index eaa2ae4..2b1bf91 100644
--- a/roles/fvs-client-mkhome/tasks/main.yml
+++ b/roles/fvs-client-mkhome/tasks/main.yml
@@ -96,7 +96,7 @@
     fstype: ext4
     state: mounted
   register: data_mounted
-  when: hostvars[inventory_hostname]['ansible_devices']['%s'|format(item)] | default(false)
+  when: item + '1' in hostvars[inventory_hostname]['ansible_devices']['%s'|format(item)]['partitions']
   loop:
     - sdb
     - sde