diff --git a/src/plugins/tracing/TracingPlugin.cc b/src/plugins/tracing/TracingPlugin.cc
index ff0dae1c..7dbb4f0e 100644
--- a/src/plugins/tracing/TracingPlugin.cc
+++ b/src/plugins/tracing/TracingPlugin.cc
@@ -58,6 +58,10 @@ bool TracingPlugin::run()
 				// only store deltas != 0
 				if (deltatime != 0) {
 					e.set_time_delta(deltatime);
+
+					// do this only if the last delta was written
+					// (no, e.g., memory map mismatch)
+					prevtime = curtime;
 				}
 				ps->writeMessage(&e);
 			}
@@ -88,6 +92,10 @@ bool TracingPlugin::run()
 				// only store deltas != 0
 				if (deltatime != 0) {
 					e.set_time_delta(deltatime);
+
+					// do this only if the last delta was written
+					// (no, e.g., memory map mismatch)
+					prevtime = curtime;
 				}
 
 				/* When we're doing a full trace, we log more data in
@@ -120,10 +128,6 @@ bool TracingPlugin::run()
 				*m_os << "[Tracing] SOMETHING IS SERIOUSLY WRONG\n";
 		}
 
-		// do this only if the last delta was written
-		// (no, e.g., memory map mismatch)
-		prevtime = curtime;
-
 		ev = simulator.resume();
 	}