diff --git a/bin/build.js b/bin/build.js
index 5f39a52..292b029 100755
--- a/bin/build.js
+++ b/bin/build.js
@@ -216,8 +216,8 @@ const generate = cb => {
     .skipTo(enddefinitions);
 
   simulation
-    .match([' ', '\n', '\t'], simulation)
-    .select(cmd('$dumpall $dumpoff $dumpon $dumpvars $comment'),
+    .match([' ', '\n', '\t', '$dumpvars', '$end'], simulation)
+    .select(cmd('$dumpall $dumpoff $dumpon $comment'),
       p.invoke(p.code.store('command'), commandSpan.start(inSimulation)))
     .select(cmd('#'),
       p.invoke(p.code.store('command'), timeSpan.start(simulationTime)))
diff --git a/vcd.c b/vcd.c
index 3dccd94..b88c5cb 100644
--- a/vcd.c
+++ b/vcd.c
@@ -136,7 +136,7 @@ METHOD(init) {
   state->tmpStr2 = tmpStr2;
   state->value = valueBuf;
   state->mask = maskBuf;
-  state->time = UINT64_MAX;
+  state->time = 0; // UINT64_MAX;
   state->digitCount = 0;
 
   napi_value status;
diff --git a/wasm_main.cpp b/wasm_main.cpp
index 0975f23..e650ecc 100644
--- a/wasm_main.cpp
+++ b/wasm_main.cpp
@@ -120,7 +120,7 @@ int init(
   state->value = valueBuf;
   state->mask = maskBuf;
   state->digitCount = 0;
-  state->time = UINT64_MAX;
+  state->time = 0; // UINT64_MAX;
 
   set_property_string("status", "declaration");