diff --git a/src/siadrive_dokan_api/siadokandrive.cpp b/src/siadrive_dokan_api/siadokandrive.cpp
index 649537c..2ee3f38 100644
--- a/src/siadrive_dokan_api/siadokandrive.cpp
+++ b/src/siadrive_dokan_api/siadokandrive.cpp
@@ -534,14 +534,14 @@ private:
 						HandleFileInformation->nFileSizeHigh = find.nFileSizeHigh;
 						HandleFileInformation->nFileSizeLow = find.nFileSizeLow;
 
-						FindClose(findHandle);
+						::FindClose(findHandle);
 					}
 				}
 			}
 
 			if (opened)
 			{
-				CloseHandle(handle);
+				::CloseHandle(handle);
 			}
 		}
 
@@ -895,7 +895,6 @@ public:
 				_mountStatus = DokanMain(&_dokanOptions, &_dokanOps);
 				OutputDebugString(std::to_wstring(_mountStatus).c_str());
 			}));
-      _mountThread->detach();
 		}
 	}
 
@@ -903,7 +902,8 @@ public:
 	{
 		if (_mountThread)
 		{
-			DokanUnmount(_mountPoint[0]);
+		  DokanRemoveMountPoint(&_mountPoint[0]);
+      _mountThread->join();
       _mountThread.reset(nullptr);
 			_mountPoint = "";
 		}