diff --git a/libisoburn/isoburn.c b/libisoburn/isoburn.c
index ba50d7d0..bc60e776 100644
--- a/libisoburn/isoburn.c
+++ b/libisoburn/isoburn.c
@@ -517,12 +517,15 @@ int isoburn_prepare_blind_grow(struct burn_drive *d, struct burn_disc **disc,
  int ret;
  struct isoburn *o= NULL;
 
- if(nwa >= 0) {
-   ret= isoburn_find_emulator(&o, out_drive, 0);
-   if(ret<0 || o==NULL)
-     return(-1);
+ ret= isoburn_find_emulator(&o, out_drive, 0);
+ if(ret<0 || o==NULL)
+   return(-1);
+ if(nwa >= 0)
    o->fabricated_msc2= nwa;
- }
+ if(o->nwa == o->zero_nwa)
+   o->nwa= o->zero_nwa= 0;
+ else
+   o->zero_nwa= 0;
  ret= isoburn_prepare_disc_aux(d, out_drive, disc, opts, 2);
  if (ret<=0)
    return ret;
diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h
index f5b2e45d..aa37e116 100644
--- a/xorriso/xorriso_timestamp.h
+++ b/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2008.07.05.133721"
+#define Xorriso_timestamP "2008.07.05.180241"