diff --git a/PathPlanning/InformedRRTStar/informed_rrt_star.py b/PathPlanning/InformedRRTStar/informed_rrt_star.py
index 0483949c99..fb15445f96 100644
--- a/PathPlanning/InformedRRTStar/informed_rrt_star.py
+++ b/PathPlanning/InformedRRTStar/informed_rrt_star.py
@@ -139,7 +139,9 @@ def find_near_nodes(self, new_node):
         r = 50.0 * math.sqrt(math.log(n_node) / n_node)
         d_list = [(node.x - new_node.x) ** 2 + (node.y - new_node.y) ** 2 for
                   node in self.node_list]
-        near_inds = [d_list.index(i) for i in d_list if i <= r ** 2]
+        near_inds = [
+            i for i, dist_sq in enumerate(d_list) if dist_sq <= r ** 2
+        ]
         return near_inds
 
     def informed_sample(self, c_max, c_min, x_center, c):
diff --git a/tests/test_informed_rrt_star.py b/tests/test_informed_rrt_star.py
index 10974ecfcb..bd78b77144 100644
--- a/tests/test_informed_rrt_star.py
+++ b/tests/test_informed_rrt_star.py
@@ -7,5 +7,37 @@ def test1():
     m.main()
 
 
+def test_equidistant_neighbors_keep_distinct_indices_and_cheaper_parent():
+    planner = m.InformedRRTStar(
+        start=[-1.0, 0.0], goal=[5.0, 0.0],
+        obstacle_list=[], rand_area=[-5.0, 5.0]
+    )
+    left = m.Node(-1.0, 0.0)
+    right = m.Node(1.0, 0.0)
+    left.cost = 9.0
+    right.cost = 1.0
+    planner.node_list = [left, right]
+
+    candidate = m.Node(0.0, 0.0)
+    near_indices = planner.find_near_nodes(candidate)
+
+    assert near_indices == [0, 1]
+    chosen = planner.choose_parent(candidate, near_indices)
+    assert chosen.parent == 1
+    assert chosen.cost == 2.0
+
+
+def test_near_nodes_preserve_equal_position_vertices():
+    planner = m.InformedRRTStar(
+        start=[0.0, 0.0], goal=[5.0, 0.0],
+        obstacle_list=[], rand_area=[-5.0, 5.0]
+    )
+    planner.node_list = [
+        m.Node(1.0, 1.0), m.Node(1.0, 1.0), m.Node(100.0, 100.0)
+    ]
+
+    assert planner.find_near_nodes(m.Node(0.0, 0.0)) == [0, 1]
+
+
 if __name__ == '__main__':
     conftest.run_this_test(__file__)