diff --git a/xorriso/iso_img.c b/xorriso/iso_img.c
index abdce3e2..3955f180 100644
--- a/xorriso/iso_img.c
+++ b/xorriso/iso_img.c
@@ -1570,7 +1570,7 @@ static int Xorriso_register_eltorito_gpt(struct XorrisO *xorriso,
 {
  if(flag & 1) {
    if(ptype == 1 || ptype == 3)
-     et_img->do_gpt_basdat= 1;
+     et_img->do_gpt_basdat= ptype;
    else if(ptype == 2)
      et_img->do_gpt_hfsplus= 1;
    return(1);
@@ -2818,7 +2818,10 @@ static int Xorriso_scan_report_lines(struct XorrisO *xorriso,
      Text_shellsafe(et_imgs[idx].sel_crit, buf, 1);
      Xorriso_record_cmd_linE
    }
-   if(et_imgs[idx].do_gpt_basdat) {
+   if(et_imgs[idx].do_gpt_basdat &&
+     !(et_imgs[idx].do_gpt_basdat == 3 && 
+       strstr(et_imgs[idx].path, "--interval:appended_partition_") ==
+       et_imgs[idx].path)) { /* (not with appended EFI partition) */
      if(mkisofs)
        sprintf(buf, "-isohybrid-gpt-basdat");
      else
diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h
index a340f3b7..a5bafb7e 100644
--- a/xorriso/xorriso_timestamp.h
+++ b/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2021.03.12.083144"
+#define Xorriso_timestamP "2021.04.04.181609"