diff --git a/racevisionGame/src/main/java/visualiser/model/ResizableRaceCanvas.java b/racevisionGame/src/main/java/visualiser/model/ResizableRaceCanvas.java
index 83ca7175..b6f41a07 100644
--- a/racevisionGame/src/main/java/visualiser/model/ResizableRaceCanvas.java
+++ b/racevisionGame/src/main/java/visualiser/model/ResizableRaceCanvas.java
@@ -794,18 +794,11 @@ public class ResizableRaceCanvas extends ResizableCanvas {
     }
 
     private Color getLineColor(Leg leg) {
-        for (VisualiserBoat boat : raceState.getBoats()) {
-            if (boat.isClientBoat()) {
-                if (boat.getCurrentLeg().getLegNumber() == leg.getLegNumber()) {
-                    return Color.ORANGE;
-                } else {
-                    return Color.MEDIUMAQUAMARINE;
-                }
-            }else{
-                return Color.MEDIUMAQUAMARINE;
-            }
+        if(ThisBoat.getInstance().getLegNumber() == leg.getLegNumber()){
+            return Color.ORANGE;
+        }else{
+            return Color.MEDIUMAQUAMARINE;
         }
-        return Color.MEDIUMAQUAMARINE;
     }
 
     private void drawArrowHead(GPSCoordinate start, GPSCoordinate end){
diff --git a/racevisionGame/src/main/java/visualiser/model/ThisBoat.java b/racevisionGame/src/main/java/visualiser/model/ThisBoat.java
index 920dcbd9..c8fa493e 100644
--- a/racevisionGame/src/main/java/visualiser/model/ThisBoat.java
+++ b/racevisionGame/src/main/java/visualiser/model/ThisBoat.java
@@ -35,6 +35,14 @@ public class ThisBoat {
         }
     }
 
+    public int getLegNumber(){
+        if(this.boat != null){
+            return this.boat.getCurrentLeg().getLegNumber();
+        }else{
+            return 0;
+        }
+    }
+
     public void setBoat(VisualiserBoat boat) {
         this.boat = boat;
     }