diff --git a/game/missiongenerator/aircraft/waypoints/racetrack.py b/game/missiongenerator/aircraft/waypoints/racetrack.py
index 068a973a..6387c8cb 100644
--- a/game/missiongenerator/aircraft/waypoints/racetrack.py
+++ b/game/missiongenerator/aircraft/waypoints/racetrack.py
@@ -73,7 +73,7 @@ class RaceTrackBuilder(PydcsWaypointBuilder):
             tacan = tanker_info.tacan
             if self.flight.tcn_name is None:
                 cs = tanker_info.callsign[:-2]
-                csn = tanker_info.callsign[-2]
+                csn = tanker_info.callsign[-1]
                 tacan_callsign = {
                     "Texaco": "TX",
                     "Arco": "AC",
@@ -93,6 +93,7 @@ class RaceTrackBuilder(PydcsWaypointBuilder):
                     tacan_callsign,
                     bearing=True,
                     unit_id=self.group.units[0].id,
-                    aa=False,
+                    aa=True,
+                    tanker=True,
                 )
             )
diff --git a/requirements.txt b/requirements.txt
index 89e7fcd5..dfedd8b9 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -30,7 +30,7 @@ platformdirs==2.5.4
 pluggy==1.0.0
 pre-commit==2.20.0
 pydantic==1.10.2
--e git+https://github.com/dcs-retribution/pydcs@9ab67af976da3c3e6939954f07ede328fe424258#egg=pydcs
+-e git+https://github.com/dcs-retribution/pydcs@9e6825beafcea041a61894bc511d572e2b92cdfc#egg=pydcs
 pyinstaller==5.6.2
 pyinstaller-hooks-contrib==2022.13
 pyparsing==3.0.9