diff --git a/xorriso/opts_p_z.c b/xorriso/opts_p_z.c
index 91fa4031..19551037 100644
--- a/xorriso/opts_p_z.c
+++ b/xorriso/opts_p_z.c
@@ -2057,7 +2057,7 @@ int Xorriso_option_volume_date(struct XorrisO *xorriso,
      ret= 1; goto ex;
    }
    ret= Decode_ecma119_format(&erg, timestring, 0);
-   if(ret <= 0) {
+   if(ret <= 0 || strlen(timestring) != 16) {
      sprintf(xorriso->info_text, "-volume_date uuid : Not an ECMA-119 time string. (16 decimal digits, range 1970... to 2999...)");
      Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
      ret= 0; goto ex;
diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h
index b18f4abc..c0d7607e 100644
--- a/xorriso/xorriso_timestamp.h
+++ b/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2015.11.04.123926"
+#define Xorriso_timestamP "2015.11.04.155640"