diff --git a/src/rufus.c b/src/rufus.c
index a8981748..3df25b7a 100644
--- a/src/rufus.c
+++ b/src/rufus.c
@@ -1022,6 +1022,7 @@ static void DisplayISOProps(void)
 DWORD WINAPI ISOScanThread(LPVOID param)
 {
 	int i;
+//	BOOL is_iso, is_img;
 
 	if (image_path == NULL)
 		goto out;
@@ -1064,7 +1065,7 @@ DWORD WINAPI ISOScanThread(LPVOID param)
 	} else {
 		// Enable bootable and set Target System and FS accordingly
 		CheckDlgButton(hMainDialog, IDC_BOOT, BST_CHECKED);
-		if (!img_report.is_bootable_img) {
+		if (img_report.is_iso) {
 			SetTargetSystem();
 			SetFSFromISO();
 			SetMBRProps();
@@ -1331,7 +1332,7 @@ static BOOL BootCheck(void)
 				return FALSE;
 			}
 		} else if ( ((fs == FS_NTFS) && (!img_report.has_bootmgr) && (!IS_WINPE(img_report.winpe)) && (!IS_GRUB(img_report)))
-				 || ((IS_FAT(fs)) && (!HAS_SYSLINUX(img_report)) && (!allow_dual_uefi_bios) &&
+				 || ((IS_FAT(fs)) && (!HAS_SYSLINUX(img_report)) && (!allow_dual_uefi_bios) && (!img_report.has_efi) &&
 					 (!IS_REACTOS(img_report)) && (!img_report.has_kolibrios) && (!IS_GRUB(img_report))) ) {
 			// Incompatible FS and ISO
 			MessageBoxU(hMainDialog, lmprintf(MSG_096), lmprintf(MSG_092), MB_OK|MB_ICONERROR|MB_IS_RTL);
diff --git a/src/rufus.rc b/src/rufus.rc
index 669b2639..d9ab2ade 100644
--- a/src/rufus.rc
+++ b/src/rufus.rc
@@ -32,7 +32,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
-CAPTION "Rufus 2.4.712"
+CAPTION "Rufus 2.4.713"
 FONT 8, "Segoe UI Symbol", 400, 0, 0x0
 BEGIN
     LTEXT           "Device",IDS_DEVICE_TXT,9,6,200,8
@@ -317,8 +317,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,4,712,0
- PRODUCTVERSION 2,4,712,0
+ FILEVERSION 2,4,713,0
+ PRODUCTVERSION 2,4,713,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -335,13 +335,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)"
             VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "2.4.712"
+            VALUE "FileVersion", "2.4.713"
             VALUE "InternalName", "Rufus"
             VALUE "LegalCopyright", "© 2011-2015 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
             VALUE "OriginalFilename", "rufus.exe"
             VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "2.4.712"
+            VALUE "ProductVersion", "2.4.713"
         END
     END
     BLOCK "VarFileInfo"