diff --git a/mapbuilder/src/main/java/map/builder/App.java b/mapbuilder/src/main/java/map/builder/App.java
index 2a4b0326b68dd053004386e12061ce1745f9a28f..8a12e73cb0407e7fdd6dc20147332c01b7f260ee 100644
--- a/mapbuilder/src/main/java/map/builder/App.java
+++ b/mapbuilder/src/main/java/map/builder/App.java
@@ -24,10 +24,10 @@ public class App {
          */
 
         // smaller BBox inside Cottbus, better for the debug tool
-        float minLat = 51.757799795929955f;
-        float minLon = 14.32136535644531f;
-        float maxLat = 51.770389396279654f;
-        float maxLon = 14.349260330200195f;
+        float minLat = 51.764092326645475f;
+        float minLon = 14.310615062713623f;
+        float maxLat = 51.766591637718435f;
+        float maxLon = 14.314413070678711f;
 
         // BBox around Cottbus
         /*
diff --git a/mapbuilder/src/main/java/map/builder/osm/OSMParser.java b/mapbuilder/src/main/java/map/builder/osm/OSMParser.java
index d26b4d55f55f33c14c9c3aa3aae8f68314ac0e66..bf8b7822a2a5a100c79871e60e809c295f7e5d86 100644
--- a/mapbuilder/src/main/java/map/builder/osm/OSMParser.java
+++ b/mapbuilder/src/main/java/map/builder/osm/OSMParser.java
@@ -67,7 +67,6 @@ public class OSMParser {
     }
 
     private void createSegment(JSONObject element, ArrayList<Long> geometry) {
-        JSONArray nodes = element.getJSONArray(OSMKey.nodes.name());
         long osmId = element.getLong(OSMKey.id.name());
         ArrayList<Coordinates> line = null;
 
@@ -80,8 +79,8 @@ public class OSMParser {
             return;
         }
 
-        long startNodeId = nodes.getLong(0);
-        long endNodeId = nodes.getLong(nodes.length() - 1);
+        long startNodeId = geometry.get(0);
+        long endNodeId = geometry.get(geometry.size() - 1);
 
         boolean oneWay = this.isOneWay(element);
         int maxSpeed = SegmentUtils.getMaxSpeed(element);
diff --git a/mapbuilder/src/main/java/map/builder/osm/SegmentUtils.java b/mapbuilder/src/main/java/map/builder/osm/SegmentUtils.java
index 49bea8c21b30e0c58861faa643718654e8974bdf..f328df785a570d8d983542f47d5ab8b55cc677cf 100644
--- a/mapbuilder/src/main/java/map/builder/osm/SegmentUtils.java
+++ b/mapbuilder/src/main/java/map/builder/osm/SegmentUtils.java
@@ -118,7 +118,9 @@ public class SegmentUtils {
                     ArrayList<Long> geometryNodeIds = extractIdsFromTo(nodes, from, i);
                     geometry.add(geometryNodeIds);
 
-                    System.out.println("Splitting at position " + from);
+                    if (from != 0) {
+                        System.out.println("Splitting at position " + from + ", nodes:");
+                    }
 
                     from = i;
                 }