diff --git a/lib/time-window.js b/lib/time-window.js
index <HASH>..<HASH> 100644
--- a/lib/time-window.js
+++ b/lib/time-window.js
@@ -40,20 +40,16 @@ util.inherits(TimeWindow, Window);
 // Writes the specified `data` to this window.
 //
 TimeWindow.prototype.write = function (data) {
-  var now = data.time ? new Date(data.time) : new Date(),
-      remove,
+  var now    = data.time ? new Date(data.time) : new Date(),
+      remove = 0,
       time;
 
   this.data.push(data);
 
   if (this.fixed) {
-    for (remove = 0; remove < this.data.length; remove++) {
-      if (!this.data[remove].time) {
-        continue;
-      }
-      else if ((now - new Date(this.data[remove].time)) > this.duration) {
-        break;
-      }
+    while ((now - new Date(this.data[remove].time)) >= this.duration
+        && remove < this.data.length) {
+      remove++;
     }
 
     this.data.splice(0, remove);
[fix] Properly remove events in a fixed TimeWindow.