diff --git a/src/Main.java b/src/Main.java
index 23972b5..07ae54f 100644
--- a/src/Main.java
+++ b/src/Main.java
@@ -20,17 +20,17 @@ public class Main {
 		Map m = Map.fromInts(map);
 
 		Game game = new Game.Builder()
-							.addCar(new Game.CarInfo("Voiture à LUWIK", Color.BLUE))
-							.addCar(new Game.CarInfo("Voiture à CHARAZADE", Color.PINK))
-							.addCar(new Game.CarInfo("Voiture de UPEC", Color.RED))
-							.setTime(1000)
-							.setMap(m)
-							.addVisual(Dashboard.class, "Voiture à LUWIK", 300, 200, 1000, 0)
-							.addVisual(Dashboard.class, "Voiture à CHARAZADE", 300, 200, 1000, 200)
-							.addVisual(Dashboard.class, "Voiture de UPEC", 300, 200, 1000, 400)
-							.addVisual(Track.class, "Piste Formule 1", 1000, 500, 1, 1)
-							.addVisual(Rankboard.class, "Score", 200, 200, 0, 510)
-							.build();
+			.addCar(new Game.CarInfo("Voiture à LUWIK", Color.BLUE))
+			.addCar(new Game.CarInfo("Voiture à CHARAZADE", Color.PINK))
+			.addCar(new Game.CarInfo("Voiture de UPEC", Color.RED))
+			.setTime(1000)
+			.setMap(m)
+			.addVisual(Dashboard.class, "Voiture à LUWIK", 300, 200, 1000, 0)
+			.addVisual(Dashboard.class, "Voiture à CHARAZADE", 300, 200, 1000, 200)
+			.addVisual(Dashboard.class, "Voiture de UPEC", 300, 200, 1000, 400)
+			.addVisual(Track.class, "Piste Formule 1", 1000, 500, 1, 1)
+			.addVisual(Rankboard.class, "Score", 200, 200, 0, 510)
+			.build();
 
 		game.run();
 	}
diff --git a/src/Map.java b/src/Map.java
index 9b0f3fd..0b8aed7 100644
--- a/src/Map.java
+++ b/src/Map.java
@@ -274,7 +274,9 @@ public class Map
      */
 	public Point getPath(int i)
 	{
-		return this.pathMap.get(i);
+		if (i < 0) return this.pathMap.getFirst();
+		else if (i >= this.pathMap.size()) return this.pathMap.getLast();
+		else return this.pathMap.get(i);
 	}
 
     /**