diff --git a/xorriso/iso_manip.c b/xorriso/iso_manip.c
index 98565265..667c7b21 100644
--- a/xorriso/iso_manip.c
+++ b/xorriso/iso_manip.c
@@ -2412,6 +2412,7 @@ int Xorriso_findi_action(struct XorrisO *xorriso, struct FindjoB *job,
  char *target, *text_2, *iso_prefix, md5[16], *basename, bless_code[17];
  struct FindjoB *subjob;
  struct stat dir_stbuf, stbuf;
+ void *xinfo;
  struct iso_hfsplus_xinfo_data *hfsplus_xinfo;
 
  action= Findjob_get_action_parms(job, &target, &text_2, &user, &group,
@@ -2556,12 +2557,12 @@ int Xorriso_findi_action(struct XorrisO *xorriso, struct FindjoB *job,
                                           target, text_2, 0);
 
  } else if(action == 46) { /* get_hfs_crtp */
-   ret= iso_node_get_xinfo(node, iso_hfsplus_xinfo_func,
-                          (void **) &hfsplus_xinfo);
+   ret= iso_node_get_xinfo(node, iso_hfsplus_xinfo_func, &xinfo);
    if(ret < 0) {
      Xorriso_process_msg_queues(xorriso, 0);
      ret= 0;
    } else if(ret == 1) {
+     hfsplus_xinfo= (struct iso_hfsplus_xinfo_data *) xinfo;
      for(i= 0; i < 4; i++)
        xorriso->result_line[i]= hfsplus_xinfo->creator_code[i];
      xorriso->result_line[4]= ' ';
@@ -2837,13 +2838,13 @@ return:
      value= 0;
    
  break; case 18: /* -has_hfs_crtp char *creator char *type */
-   ret= iso_node_get_xinfo(node, iso_hfsplus_xinfo_func,
-                          (void **) &hfsplus_xinfo);
+   ret= iso_node_get_xinfo(node, iso_hfsplus_xinfo_func, &xinfo_dummy);
    value= 0;
    if(ret < 0) {
      Xorriso_process_msg_queues(xorriso, 0);
      ret= 0;
    } else if(ret == 1) {
+     hfsplus_xinfo= (struct iso_hfsplus_xinfo_data *) xinfo_dummy;
      if((strlen(arg1) == 1 ||
          (strncmp(arg1, (char *) hfsplus_xinfo->creator_code, 4) == 0 &&
           strlen(arg1) == 4)) &&
diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h
index 4d45d932..1b8d43d0 100644
--- a/xorriso/xorriso_timestamp.h
+++ b/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2012.06.05.103058"
+#define Xorriso_timestamP "2012.06.05.145849"