Index: classes/Timeline.class.inc
===================================================================
--- classes/Timeline.class.inc	(revision 155)
+++ classes/Timeline.class.inc	(working copy)
@@ -84,12 +84,12 @@
           $color = $this->getColor();
         }
 
-        foreach ($set as $row) {
+        foreach ($set as $row_key =>$row) {
+          $this->view->row_index = $row_key;
           $event = new TimelineEvent($this->view, $row, $this->dateformat, $css_selector, $color);
           if ($event->getData()) {
             $events[] = $event->getData();
           }
-          $this->view->row_index++;
         }
       }
     }