diff --git a/src/main/java/de/avatic/lcc/repositories/NodeRepository.java b/src/main/java/de/avatic/lcc/repositories/NodeRepository.java
index ec95252..7213b74 100644
--- a/src/main/java/de/avatic/lcc/repositories/NodeRepository.java
+++ b/src/main/java/de/avatic/lcc/repositories/NodeRepository.java
@@ -387,7 +387,7 @@ public class NodeRepository {
 
         String query = """
                 SELECT * FROM node
-                WHERE is_deprecated = FALSE AND
+                WHERE is_deprecated = FALSE AND id != ? AND
                       (
                         6371 * acos(
                             cos(radians(?)) *
@@ -399,7 +399,7 @@ public class NodeRepository {
                     ) <= ?
                 """;
 
-        return jdbcTemplate.query(query, new NodeMapper(), node.getGeoLat(), node.getGeoLng(), node.getGeoLat(), regionRadius);
+        return jdbcTemplate.query(query, new NodeMapper(), node.getId(), node.getGeoLat(), node.getGeoLng(), node.getGeoLat(), regionRadius);
     }
 
 
diff --git a/src/main/java/de/avatic/lcc/service/calculation/RoutingService.java b/src/main/java/de/avatic/lcc/service/calculation/RoutingService.java
index d92e70f..bd95c54 100644
--- a/src/main/java/de/avatic/lcc/service/calculation/RoutingService.java
+++ b/src/main/java/de/avatic/lcc/service/calculation/RoutingService.java
@@ -448,7 +448,7 @@ public class RoutingService {
                     finalSection = connectNearByNodes(chain.getLast(), nearByNodes, container);
                     if (finalSection != null) {
                         connectionType = SourceConnectionType.FINAL_SECTION_WITH_NEAR_BY_NODE;
-                        nearByNode = finalSection.getToNode();
+                        nearByNode = finalSection.getFromNode();
                     }
                 }