--- a/src/devices/wifi/interference-helper.cc	Mon Sep 21 23:44:59 2009 -0700
+++ b/src/devices/wifi/interference-helper.cc	Tue Sep 22 17:33:03 2009 +0200
@@ -460,7 +460,11 @@
           i++;
           continue;
         }
-      if (event->Overlaps ((*i)->GetStartTime ())) 
+      if ((*i)->Overlaps (event->GetStartTime ())) 
+        {
+          noiseInterference += (*i)->GetRxPowerW ();
+        }
+      else if (event->Overlaps ((*i)->GetStartTime ())) 
         {
           ni->push_back (NiChange ((*i)->GetStartTime (), (*i)->GetRxPowerW ()));
         }
@@ -468,10 +472,6 @@
         {
           ni->push_back (NiChange ((*i)->GetEndTime (), -(*i)->GetRxPowerW ()));
         }
-      if ((*i)->Overlaps (event->GetStartTime ())) 
-        {
-          noiseInterference += (*i)->GetRxPowerW ();
-        }
       i++;
     }
   ni->push_back (NiChange (event->GetStartTime (), noiseInterference));