diff --git a/manifests/init.pp b/manifests/init.pp
index 4e5e7f5..d51250e 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -60,13 +60,13 @@
           ensure_resource('file', $dirtree, {'ensure' => 'directory'})
 
           exec { "/bin/mount '${dest}'":
-            unless  => "/bin/mount -l | /bin/grep '${dest}'",
+            unless  => "/bin/mount -l | /bin/grep ' on ${dest} type '",
             require => [File[$dirtree], Fstab["fstab entry for ${source} to ${dest} as ${type}"]],
           }
         }
         'absent': {
           exec { "/bin/umount '${dest}'":
-            onlyif => "/bin/mount -l | /bin/grep '${dest}'",
+            onlyif => "/bin/mount -l | /bin/grep ' on ${dest} type '",
             before => Fstab["fstab entry for ${source} to ${dest} as ${type}"],
           }