diff --git a/src/rufus.rc b/src/rufus.rc
index aef89b07..c811a2db 100644
--- a/src/rufus.rc
+++ b/src/rufus.rc
@@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 IDD_DIALOG DIALOGEX 12, 12, 242, 376
 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_ACCEPTFILES
-CAPTION "Rufus 2.13.1063"
+CAPTION "Rufus 2.13.1064"
 FONT 8, "Segoe UI Symbol", 400, 0, 0x0
 BEGIN
     LTEXT           "Device",IDS_DEVICE_TXT,9,6,200,8
@@ -334,8 +334,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,13,1063,0
- PRODUCTVERSION 2,13,1063,0
+ FILEVERSION 2,13,1064,0
+ PRODUCTVERSION 2,13,1064,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -352,13 +352,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)"
             VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "2.13.1063"
+            VALUE "FileVersion", "2.13.1064"
             VALUE "InternalName", "Rufus"
             VALUE "LegalCopyright", "© 2011-2017 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
             VALUE "OriginalFilename", "rufus.exe"
             VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "2.13.1063"
+            VALUE "ProductVersion", "2.13.1064"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/src/syslinux.c b/src/syslinux.c
index 3ef199d7..57b84dab 100644
--- a/src/syslinux.c
+++ b/src/syslinux.c
@@ -89,7 +89,7 @@ BOOL InstallSyslinux(DWORD drive_index, char drive_letter, int fs_type)
 	HANDLE f_handle = INVALID_HANDLE_VALUE;
 	HANDLE d_handle = INVALID_HANDLE_VALUE;
 	DWORD bytes_read, bytes_written, err;
-	S_NTFSSECT_VOLINFO vol_info;
+	S_NTFSSECT_VOLINFO vol_info = { 0 };
 	LARGE_INTEGER vcn, lba, len;
 	S_NTFSSECT_EXTENT extent;
 	BOOL r = FALSE;
diff --git a/src/syslinux/win/ntfssect.c b/src/syslinux/win/ntfssect.c
index 3dd6d7f0..800743d7 100644
--- a/src/syslinux/win/ntfssect.c
+++ b/src/syslinux/win/ntfssect.c
@@ -146,9 +146,12 @@ DWORD M_NTFSSECT_API NtfsSectGetVolumeInfo(
     if (!VolumeName || !VolumeInfo)
       return ERROR_INVALID_PARAMETER;
 
-    rc = NtfsSectGetVolumeHandle(VolumeName, VolumeInfo);
-    if (rc != ERROR_SUCCESS)
-      goto err_handle;
+    /* Only create a handle if it's not already been set */
+    if ((VolumeInfo->Handle == NULL) || (VolumeInfo->Handle == INVALID_HANDLE_VALUE)) {
+      rc = NtfsSectGetVolumeHandle(VolumeName, VolumeInfo);
+      if (rc != ERROR_SUCCESS)
+        goto err_handle;
+    }
 
     rc = NtfsSectLoadXpFuncs(&xp_funcs);
     if (rc != ERROR_SUCCESS)