diff --git a/libisoburn/isoburn.c b/libisoburn/isoburn.c
index bc60e776..a706f981 100644
--- a/libisoburn/isoburn.c
+++ b/libisoburn/isoburn.c
@@ -352,7 +352,7 @@ int isoburn_prepare_disc_aux(struct burn_drive *in_d, struct burn_drive *out_d,
  struct isoburn *in_o, *out_o;
  IsoWriteOpts *wopts= NULL;
  enum burn_disc_status state;
- int ret, fifo_chunks, nwa, i, new_img, early_indev_release;
+ int ret, fifo_chunks, lba, nwa, i, new_img, early_indev_release;
  size_t buffer_size= 0, buffer_free= 0;
  char msg[160];
 
@@ -422,7 +422,9 @@ int isoburn_prepare_disc_aux(struct burn_drive *in_d, struct burn_drive *out_d,
  iso_write_opts_set_default_gid(wopts, opts->gid);
  iso_write_opts_set_output_charset(wopts, opts->output_charset);
  iso_write_opts_set_fifo_size(wopts, fifo_chunks);
- 
+
+ ret = isoburn_disc_track_lba_nwa(out_d, NULL, 0, &lba, &nwa);
+ opts->effective_lba= nwa;
  ret= isoburn_get_msc2(out_o, NULL, &nwa, 0);
  if (ret != 1) {
    isoburn_msgs_submit(out_o, 0x00060000,
@@ -430,7 +432,6 @@ int isoburn_prepare_disc_aux(struct burn_drive *in_d, struct burn_drive *out_d,
    {ret= -3; goto ex;}
  }
  iso_write_opts_set_ms_block(wopts, nwa);
- opts->effective_lba= nwa;
  iso_write_opts_set_appendable(wopts, !new_img);
  iso_write_opts_set_overwrite_buf(wopts,
                                   nwa>0 ? out_o->target_iso_head : NULL);
diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h
index 6e0bc268..1cb18702 100644
--- a/xorriso/xorriso_timestamp.h
+++ b/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2008.07.07.150241"
+#define Xorriso_timestamP "2008.07.07.150337"