diff --git a/xorriso/iso_img.c b/xorriso/iso_img.c
index d45abbaf..c1e94e4b 100644
--- a/xorriso/iso_img.c
+++ b/xorriso/iso_img.c
@@ -2494,7 +2494,16 @@ static int Xorriso_scan_report_lines(struct XorrisO *xorriso,
    Xorriso_record_cmd_linE
    did_sysarea= 1;
  }
- if(iso_gpt_part_idx >= 0) {
+ if(iso_mbr_part_type >= 0) {
+   if(mkisofs)
+     sprintf(buf, "-iso_mbr_part_type 0x%2.2x",
+                  (unsigned int) iso_mbr_part_type);
+   else
+     sprintf(buf, "-boot_image any iso_mbr_part_type=0x%2.2x",
+                  (unsigned int) iso_mbr_part_type);
+   Xorriso_record_cmd_linE
+
+ } else if(iso_gpt_part_idx >= 0) {
    if(mkisofs)
      sprintf(buf, "-iso_mbr_part_type ");
    else
@@ -2503,14 +2512,6 @@ static int Xorriso_scan_report_lines(struct XorrisO *xorriso,
                         0);
    Xorriso_record_cmd_linE
    
- } else if(iso_mbr_part_type >= 0) {
-   if(mkisofs)
-     sprintf(buf, "-iso_mbr_part_type 0x%2.2x",
-                  (unsigned int) iso_mbr_part_type);
-   else
-     sprintf(buf, "-boot_image any iso_mbr_part_type=0x%2.2x",
-                  (unsigned int) iso_mbr_part_type);
-   Xorriso_record_cmd_linE
  }
 
  /* Issue commands related to El Torito */
diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h
index 4b676d1e..40cb0d3f 100644
--- a/xorriso/xorriso_timestamp.h
+++ b/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2019.07.13.153027"
+#define Xorriso_timestamP "2019.07.22.181418"