diff --git a/reactos/ntoskrnl/fstub/disksup.c b/reactos/ntoskrnl/fstub/disksup.c
index 0ba6e2241f0..32e239279e0 100644
--- a/reactos/ntoskrnl/fstub/disksup.c
+++ b/reactos/ntoskrnl/fstub/disksup.c
@@ -481,7 +481,7 @@ xHalIoAssignDriveLetters(IN PLOADER_PARAMETER_BLOCK LoaderBlock,
             NULL);
 
         Status = ZwOpenFile(&FileHandle,
-            FILE_READ_DATA | SYNCHRONIZE,
+            FILE_READ_ATTRIBUTES | SYNCHRONIZE,
             &ObjectAttributes,
             &StatusBlock,
             FILE_SHARE_READ,
diff --git a/reactos/ntoskrnl/io/iomgr/file.c b/reactos/ntoskrnl/io/iomgr/file.c
index 7f3e07231ab..38568a1e69d 100644
--- a/reactos/ntoskrnl/io/iomgr/file.c
+++ b/reactos/ntoskrnl/io/iomgr/file.c
@@ -404,6 +404,9 @@ IopParseDevice(IN PVOID ParseObject,
 
     /* FIXME: Small hack still exists, have to check why...
      * This is triggered multiple times by usetup and then once per boot.
+     * TMN: NOTE: It might have been fixed now, by changing the requested
+     * openmode in xHalIoAssignDriveLetters from FILE_READ_DATA to
+     * FILE_READ_ATTRIBUTES. If verified, this hack should be removed.
      */
     if (!(DirectOpen) &&
         !(RemainingName->Length) &&