diff --git a/libisoburn/isoburn.c b/libisoburn/isoburn.c
index 5bc40549..ddea8e34 100644
--- a/libisoburn/isoburn.c
+++ b/libisoburn/isoburn.c
@@ -500,9 +500,6 @@ int isoburn_prepare_disc_aux(struct burn_drive *in_d, struct burn_drive *out_d,
  ret= isoburn_adjust_target_iso_head(out_o, opts->partition_offset, 0);
  if(ret <= 0)
    {ret= -1; goto ex;}
- iso_write_opts_set_overwrite_buf(wopts,
-                                  nwa>0 ? out_o->target_iso_head : NULL);
-
  if(opts->no_emul_toc) {
    if(out_o->nwa == out_o->zero_nwa &&
       out_o->zero_nwa == Libisoburn_overwriteable_starT 
@@ -523,6 +520,8 @@ int isoburn_prepare_disc_aux(struct burn_drive *in_d, struct burn_drive *out_d,
  }
  iso_write_opts_set_ms_block(wopts, nwa);
  iso_write_opts_set_appendable(wopts, !new_img);
+ iso_write_opts_set_overwrite_buf(wopts,
+                                  nwa>0 ? out_o->target_iso_head : NULL);
  iso_write_opts_set_part_offset(wopts, opts->partition_offset,
                                 opts->partition_secs_per_head,
                                 opts->partition_heads_per_cyl);
diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h
index 44aa960e..37a43c7f 100644
--- a/xorriso/xorriso_timestamp.h
+++ b/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2010.09.19.134042"
+#define Xorriso_timestamP "2010.09.19.135354"