diff --git a/libisoburn/burn_wrap.c b/libisoburn/burn_wrap.c
index f3b73af7..e1c9f89c 100644
--- a/libisoburn/burn_wrap.c
+++ b/libisoburn/burn_wrap.c
@@ -1639,10 +1639,15 @@ not_found:;
      if(tracks==NULL)
    continue;
      for(j= 0; j<num_tracks; j++) {
-       isoburn_get_track_lba(tracks[0], &lba, 0);
-       ret= isoburn_read_iso_head(d, lba, &size, volid, 1);
-       if(ret<=0)
+       ret= isoburn_toc_track_get_emul(tracks[0], &lba, &size, volid, 0);
+       if(ret < 0)
      continue;
+       if(ret == 0) {
+         isoburn_get_track_lba(tracks[0], &lba, 0);
+         ret= isoburn_read_iso_head(d, lba, &size, volid, 1);
+         if(ret<=0)
+     continue;
+       }
        if(flag & 4) {
          ret= regexec(&re, volid, 1, match, 0);
          if(ret != 0)
diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h
index 03faae1a..76b7d672 100644
--- a/xorriso/xorriso_timestamp.h
+++ b/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2009.04.23.103301"
+#define Xorriso_timestamP "2009.04.25.160022"