diff --git a/xorriso/write_run.c b/xorriso/write_run.c
index 45ece519..36fdc059 100644
--- a/xorriso/write_run.c
+++ b/xorriso/write_run.c
@@ -122,7 +122,7 @@ no_track:;
      Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "NOTE", 0);
    }
  }
- if(xorriso->alignment == 0) {
+ if(xorriso->alignment == 0 && ! (xorriso->no_emul_toc & 1)) {
    ret= isoburn_needs_emulation(drive);
    if(ret > 0) {
      /* Take care that the session is padded up to the future NWA.
diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h
index 5db9ef98..a58b24ad 100644
--- a/xorriso/xorriso_timestamp.h
+++ b/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2010.09.29.092537"
+#define Xorriso_timestamP "2010.09.29.124423"