diff --git a/aman/config/Airport.py b/aman/config/Airport.py
index aed6871..6a87e92 100644
--- a/aman/config/Airport.py
+++ b/aman/config/Airport.py
@@ -162,6 +162,15 @@ class Airport:
 
                         index += 1
 
+                    # check if we have to add the last waypoint
+                    if 0 != len(waypoints) and waypointName != waypoints[-1].Name:
+                        waypoints.append(Waypoint(name = waypointName, base = isBaseTurn, final = isFinalTurn))
+                        if -1 != constraints[0]:
+                            waypoints[-1].Altitude = constraints[0]
+                        if -1 != constraints[1]:
+                            waypoints[-1].Speed = constraints[1]
+
+                    # register the arrival route
                     self.ArrivalRouteConstraints[star] = waypoints
 
     def __init__(self, filepath : str, icao : str):