diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h
index 6ddc01ad..79b624a1 100644
--- a/xorriso/xorriso_timestamp.h
+++ b/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2010.04.27.072331"
+#define Xorriso_timestamP "2010.04.27.074834"
diff --git a/xorriso/xorrisoburn.c b/xorriso/xorrisoburn.c
index 0174a995..e19759c1 100644
--- a/xorriso/xorrisoburn.c
+++ b/xorriso/xorrisoburn.c
@@ -2364,7 +2364,8 @@ int Xorriso_write_session(struct XorrisO *xorriso, int flag)
      ret= Xorriso_attach_boot_image(xorriso, xorriso->boot_count == 0);
      if(ret <= 0)
        goto ex;
-
+   }
+   if(xorriso->boot_count > 0) {
      /* Eventually rename boot catalog node to changed boot_image_cat_path */
      if(is_bootable > 0) {
        ret= Xorriso_path_from_node(xorriso, (IsoNode *) bootcat_node, sfe, 0);