diff --git a/pyrevolve/angle/manage/robotmanager.py b/pyrevolve/angle/manage/robotmanager.py
index 034404d4d7..93e14e7c7d 100644
--- a/pyrevolve/angle/manage/robotmanager.py
+++ b/pyrevolve/angle/manage/robotmanager.py
@@ -145,8 +145,8 @@ def update_state(self, world, time, state, poses_file):
 
         if len(self._dt) >= self.speed_window:
             # Subtract oldest values if we're about to override it
-            self._dist -= self._ds[-1]
-            self._time -= self._dt[-1]
+            self._dist -= self._ds[0]
+            self._time -= self._dt[0]
 
         self.last_position = position
         self.last_update = time