diff --git a/xorriso/write_run.c b/xorriso/write_run.c
index 7127d7dd..ab70c52a 100644
--- a/xorriso/write_run.c
+++ b/xorriso/write_run.c
@@ -1060,13 +1060,13 @@ int Xorriso_write_session(struct XorrisO *xorriso, int flag)
 
  /* Activate, adjust or discard boot image */
  if(image!=NULL) {
-   is_bootable= iso_image_get_boot_image(image, NULL, NULL, &bootcat_node);
    if(xorriso->boot_image_bin_path[0]) {
      ret= Xorriso_attach_boot_image(xorriso, xorriso->boot_count == 0);
      if(ret <= 0)
        goto ex;
      freshly_bootable= 1;
    }
+   is_bootable= iso_image_get_boot_image(image, NULL, NULL, &bootcat_node);
  }
  if(image!=NULL && !(flag&1)) {
    if(xorriso->boot_count > 0 || freshly_bootable) {
diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h
index baff8e4b..dd36fa83 100644
--- a/xorriso/xorriso_timestamp.h
+++ b/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2014.12.29.142036"
+#define Xorriso_timestamP "2015.02.04.113526"