diff --git a/src/main/java/seng302/controllers/CanvasController.java b/src/main/java/seng302/controllers/CanvasController.java
index 898eb714..25e873e3 100644
--- a/src/main/java/seng302/controllers/CanvasController.java
+++ b/src/main/java/seng302/controllers/CanvasController.java
@@ -82,8 +82,8 @@ public class CanvasController {
             for (Event event : events) {
                 keyFrames.add(
                         new KeyFrame(Duration.seconds(event.getTime() / 60 / 60 / 5),
-                                new KeyValue(x, event.getMark().getLatitude()),
-                                new KeyValue(y, event.getMark().getLongitude())
+                                new KeyValue(x, event.getThisMark().getLatitude()),
+                                new KeyValue(y, event.getThisMark().getLongitude())
                         )
                 );
             }
diff --git a/src/main/java/seng302/models/Event.java b/src/main/java/seng302/models/Event.java
index 85da94a3..51eb814c 100644
--- a/src/main/java/seng302/models/Event.java
+++ b/src/main/java/seng302/models/Event.java
@@ -147,8 +147,8 @@ public class Event {
      *
      * @return the mark
      */
-    public Mark getMark() {
-        return this.mark2;
+    public Mark getThisMark() {
+        return this.mark1;
     }
 
     /**
@@ -157,6 +157,6 @@ public class Event {
      * @return the next mark
      */
     public Mark getNextMark() {
-        return this.mark1;
+        return this.mark2;
     }
 }
\ No newline at end of file
diff --git a/src/main/java/seng302/models/Race.java b/src/main/java/seng302/models/Race.java
index 4fe443c2..ab036664 100644
--- a/src/main/java/seng302/models/Race.java
+++ b/src/main/java/seng302/models/Race.java
@@ -100,6 +100,13 @@ public class Race {
                     }
                     totalDistance += event.getDistanceBetweenMarks();
                 }
+
+                // There are no more marks after this event
+
+                else{
+                    Event event = new Event(time, boat, course.get(i), course.get(i));
+                    events.get(boat).add(event);
+                }
             }
         }
     }