diff --git a/src/rufus.c b/src/rufus.c
index 8c42f241..b58cab78 100644
--- a/src/rufus.c
+++ b/src/rufus.c
@@ -227,10 +227,6 @@ static BOOL DefineClusterSizes(void)
 
 	default_fs = FS_UNKNOWN;
 	memset(&SelectedDrive.ClusterSize, 0, sizeof(SelectedDrive.ClusterSize));
-	if (SelectedDrive.DiskSize < 8*MB) {
-		uprintf("Device was eliminated because it is smaller than 8 MB\n");
-		goto out;
-	}
 
 /*
  * The following are MS's allowed cluster sizes for FAT16 and FAT32:
@@ -343,7 +339,6 @@ static BOOL DefineClusterSizes(void)
 		}
 	}
 
-out:
 	// Only add the filesystems we can service
 	for (fs=0; fs<FS_MAX; fs++) {
 		// Remove all cluster sizes that are below the sector size
diff --git a/src/rufus.h b/src/rufus.h
index 4f174b8f..6348423e 100644
--- a/src/rufus.h
+++ b/src/rufus.h
@@ -48,6 +48,7 @@
 #define DRIVE_ACCESS_RETRIES        60			// How many times we should retry
 #define DRIVE_INDEX_MIN             0x00000080
 #define DRIVE_INDEX_MAX             0x000000C0
+#define MIN_DRIVE_SIZE              8			// Minimum size a drive must have, to be formattable (in MB)
 #define MIN_EXTRA_PART_SIZE         (1024*1024)		// Minimum size of the extra partition, in bytes
 #define MAX_DRIVES                  (DRIVE_INDEX_MAX - DRIVE_INDEX_MIN)
 #define MAX_TOOLTIPS                128
diff --git a/src/rufus.rc b/src/rufus.rc
index 9b43696e..72471d9f 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.8.859"
+CAPTION "Rufus 2.8.860"
 FONT 8, "Segoe UI Symbol", 400, 0, 0x0
 BEGIN
     LTEXT           "Device",IDS_DEVICE_TXT,9,6,200,8
@@ -320,8 +320,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,8,859,0
- PRODUCTVERSION 2,8,859,0
+ FILEVERSION 2,8,860,0
+ PRODUCTVERSION 2,8,860,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -338,13 +338,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)"
             VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "2.8.859"
+            VALUE "FileVersion", "2.8.860"
             VALUE "InternalName", "Rufus"
             VALUE "LegalCopyright", "© 2011-2016 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
             VALUE "OriginalFilename", "rufus.exe"
             VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "2.8.859"
+            VALUE "ProductVersion", "2.8.860"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/src/usb.c b/src/usb.c
index acf0246c..762429d3 100644
--- a/src/usb.c
+++ b/src/usb.c
@@ -537,6 +537,12 @@ BOOL GetUSBDevices(DWORD devnum)
 				safe_free(devint_detail_data);
 				break;
 			}
+			if (GetDriveSize(drive_index) < (MIN_DRIVE_SIZE*1024*1024)) {
+				uprintf("Device eliminated because it is smaller than %d MB\n", MIN_DRIVE_SIZE);
+				safe_closehandle(hDrive);
+				safe_free(devint_detail_data);
+				break;
+			}
 
 			if (GetDriveLabel(drive_index, drive_letters, &label)) {
 				if ((props.is_SCSI) && (!props.is_UASP) && (!props.is_VHD)) {