diff --git a/gui/action.cpp b/gui/action.cpp
index 047dc62..e069c0f7 100755
--- a/gui/action.cpp
+++ b/gui/action.cpp
@@ -1948,7 +1948,7 @@
 				// PartitionManager failed to unmount /vendor, this should not happen,
 				// but in case it does, do a lazy unmount
 				LOGINFO("WARNING: vendor partition could not be unmounted normally!\n");
-				umount2("/vendor", MNT_DETACH);
+				PartitionManager.UnMount_By_Path("/vendor", false, MNT_DETACH);
 			}
 		}
 		PartitionManager.Set_Active_Slot(arg);
diff --git a/kernel_module_loader.cpp b/kernel_module_loader.cpp
index 47ca4a3..c6761d8 100644
--- a/kernel_module_loader.cpp
+++ b/kernel_module_loader.cpp
@@ -106,7 +106,7 @@
 	if (ven)
 		ven->UnMount(false);
 	if (ven_dlkm)
-		ven_dlkm->UnMount(false);
+		ven_dlkm->UnMount(false, MNT_DETACH);
 
 	android::base::SetProperty(TW_MODULES_MOUNTED_PROP, "true");
 
@@ -130,7 +130,7 @@
 			Modprobe m({module_dir}, "modules.load.twrp", false);
 			m.LoadListedModules(false);
 			modules_loaded = m.GetModuleCount();
-			umount2(module_dir.c_str(), MNT_DETACH);
+			PartitionManager.UnMount_By_Path(module_dir.c_str(), false, MNT_DETACH);
 			LOGINFO("Modules Loaded: %d\n", modules_loaded);
 		}
 		return modules_loaded;
diff --git a/twrpApex.cpp b/twrpApex.cpp
index 22da17a..557283b 100755
--- a/twrpApex.cpp
+++ b/twrpApex.cpp
@@ -190,5 +190,5 @@
 }
 
 bool twrpApex::Unmount() {
-	return (umount2(APEX_BASE, MNT_DETACH) == 0);
+	return (PartitionManager.UnMount_By_Path(APEX_BASE, false, MNT_DETACH) == 0);
 }