diff --git a/src/gui/widgets/timeline/timeline-body.cpp b/src/gui/widgets/timeline/timeline-body.cpp
index d6ee18eba..3d47f9500 100644
--- a/src/gui/widgets/timeline/timeline-body.cpp
+++ b/src/gui/widgets/timeline/timeline-body.cpp
@@ -317,7 +317,7 @@ TimelineBody::draw_tracks(Cairo::RefPtr<Cairo::Context> cr)
           cr->translate(0, rect->get_y());
           
           // Draw the track
-          draw_track(cr, model_track, allocation.get_width());
+          draw_track(cr, timeline_track, allocation.get_width());
         } 
     }
   
@@ -327,15 +327,13 @@ TimelineBody::draw_tracks(Cairo::RefPtr<Cairo::Context> cr)
 
 void
 TimelineBody::draw_track(Cairo::RefPtr<Cairo::Context> cr,
-  shared_ptr<model::Track> model_track, const int view_width) const
+  shared_ptr<timeline::Track> timeline_track,
+  const int view_width) const
 {
   REQUIRE(cr);
-  REQUIRE(model_track != NULL);
+  REQUIRE(timeline_track != NULL);
   REQUIRE(timelineWidget != NULL);
-  
-  shared_ptr<timeline::Track> timeline_track = timelineWidget->
-    lookup_timeline_track(model_track);
-  
+    
   const int height = timeline_track->get_height();
   REQUIRE(height >= 0);
 
diff --git a/src/gui/widgets/timeline/timeline-body.hpp b/src/gui/widgets/timeline/timeline-body.hpp
index 12ec6c5a9..fe4ecd2ef 100644
--- a/src/gui/widgets/timeline/timeline-body.hpp
+++ b/src/gui/widgets/timeline/timeline-body.hpp
@@ -119,7 +119,8 @@ private:
   void draw_tracks(Cairo::RefPtr<Cairo::Context> cr);
   
   void draw_track(Cairo::RefPtr<Cairo::Context> cr,
-    boost::shared_ptr<model::Track> track, const int view_width) const;
+    boost::shared_ptr<timeline::Track> timeline_track,
+    const int view_width) const;
   
   /**
    * Draws the selected timeline period.