diff --git a/src/sys/file.c b/src/sys/file.c
index fd39b67f..0e0955c3 100755
--- a/src/sys/file.c
+++ b/src/sys/file.c
@@ -1067,7 +1067,7 @@ NTSTATUS FspFileNodeRenameCheck(PDEVICE_OBJECT FsvolDeviceObject, PIRP OplockIrp
 
     if (!CheckingOldName)
     {
-        /* make sure no processes are mapping any descendants as an image */
+        /* replaced file cannot be a directory or mapped as an image */
         for (
             DescendantFileNodeIndex = 0;
             DescendantFileNodeCount > DescendantFileNodeIndex;
@@ -1076,8 +1076,10 @@ NTSTATUS FspFileNodeRenameCheck(PDEVICE_OBJECT FsvolDeviceObject, PIRP OplockIrp
             DescendantFileNode = DescendantFileNodes[DescendantFileNodeIndex];
             DescendantFileNode = (PVOID)((UINT_PTR)DescendantFileNode & ~7);
 
-            if (!MmFlushImageSection(&DescendantFileNode->NonPaged->SectionObjectPointers,
-                MmFlushForDelete))
+            if ((DescendantFileNode->FileName.Length > FileName->Length &&
+                L'\\' == DescendantFileNode->FileName.Buffer[FileName->Length / sizeof(WCHAR)]) ||
+                !MmFlushImageSection(&DescendantFileNode->NonPaged->SectionObjectPointers,
+                    MmFlushForDelete))
             {
                 /* release the FileNode in case of failure! */
                 FspFileNodeReleaseF(FileNode, AcquireFlags);
diff --git a/tst/winfsp-tests/info-test.c b/tst/winfsp-tests/info-test.c
index 2fb2beca..637fd30c 100644
--- a/tst/winfsp-tests/info-test.c
+++ b/tst/winfsp-tests/info-test.c
@@ -537,7 +537,7 @@ static void rename_dotest(ULONG Flags, PWSTR Prefix, ULONG FileInfoTimeout)
     Success = MoveFileExW(File1Path, File2Path, 0);
     ASSERT(Success);
 
-    /* cannot replace existing directory regardless of MOVEFILE_REPLACE_EXISTING */
+    /* cannot replace existing directory regardless of MOVEFILE_REPLACE_EXISTING -- test MEMFS */
     Success = MoveFileExW(Dir2Path, Dir1Path, MOVEFILE_REPLACE_EXISTING);
     ASSERT(!Success);
     ASSERT(ERROR_ACCESS_DENIED == GetLastError());
@@ -562,6 +562,22 @@ static void rename_dotest(ULONG Flags, PWSTR Prefix, ULONG FileInfoTimeout)
 
     CloseHandle(Handle);
 
+    Success = CreateDirectoryW(Dir1Path, 0);
+    ASSERT(Success);
+
+    /* cannot replace existing directory regardless of MOVEFILE_REPLACE_EXISTING -- test FSD */
+    Handle = CreateFileW(File2Path,
+        GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, 0,
+        OPEN_EXISTING, 0, 0);
+    ASSERT(INVALID_HANDLE_VALUE != Handle);
+    Success = MoveFileExW(Dir1Path, Dir2Path, MOVEFILE_REPLACE_EXISTING);
+    ASSERT(!Success);
+    ASSERT(ERROR_ACCESS_DENIED == GetLastError());
+    CloseHandle(Handle);
+
+    Success = RemoveDirectoryW(Dir1Path);
+    ASSERT(Success);
+
     Success = DeleteFileW(File2Path);
     ASSERT(Success);