diff --git a/src/Map.java b/src/Map.java
index 468e902..a407a37 100644
--- a/src/Map.java
+++ b/src/Map.java
@@ -217,8 +217,9 @@ public class Map
 					if (next.equals(previous))
 						continue;
 
-					Circuit element = getElement(x, y);
-					if (element.isRoad() || (element.isFinish() && element.isRoad()))
+					Circuit element		= getElement(x, y);
+					Circuit cElement	= getElement(current.x, current.y);
+					if (element.isRoad() || (element.isFinish() && cElement.isRoad()))
 					{
 						previous = current;
 						current = next;