diff --git a/libs/shape.py b/libs/shape.py
index 55866c5b..65b5bac1 100644
--- a/libs/shape.py
+++ b/libs/shape.py
@@ -153,10 +153,13 @@ class Shape(object):
             assert False, "unsupported vertex shape"
 
     def nearest_vertex(self, point, epsilon):
+        index = None
         for i, p in enumerate(self.points):
-            if distance(p - point) <= epsilon:
-                return i
-        return None
+            dist = distance(p - point)
+            if dist <= epsilon:
+                index = i
+                epsilon = dist
+        return index
 
     def contains_point(self, point):
         return self.make_path().contains(point)