diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Shiftstrategies/AMTShiftStrategy.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Shiftstrategies/AMTShiftStrategy.cs
index 59e58915f7c74bfc84941f8107dc9bb4767114b8..d20f4a2f9f1712ae825c3f844b1d3e24c830d6b7 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Shiftstrategies/AMTShiftStrategy.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Shiftstrategies/AMTShiftStrategy.cs
@@ -73,11 +73,12 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 			var runData = dataBus.RunData;
 			EarlyShiftUp = true;
 			SkipGears = true;
+
+			_shiftPolygonCalculator = ShiftPolygonCalculator.Create(Name, null);
 			if (runData.EngineData == null) {
 				return;
 			}
 
-			_shiftPolygonCalculator = ShiftPolygonCalculator.Create(Name, null);
 			var transmissionRatio = runData.AxleGearData.AxleGear.Ratio *
 									(runData.AngledriveData?.Angledrive.Ratio ?? 1.0) /
 									runData.VehicleData.DynamicTyreRadius;
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Shiftstrategies/ShiftPolygonCreator.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Shiftstrategies/ShiftPolygonCreator.cs
index e5be5101bd5455b74f6a05cacd2f38a558f15bf8..73dea7e5d34955b718283c8f84c39f768c8b82e1 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Shiftstrategies/ShiftPolygonCreator.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Shiftstrategies/ShiftPolygonCreator.cs
@@ -40,8 +40,9 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl.Shiftstrategies
 				}
 				return new PEVAMTShiftStrategyPolygonCreator(shiftStrategyParameters);
 			}
-
-
+			if (name == ATShiftStrategy.Name) {
+				return new ATShiftStrategyPolygonCalculator();
+			}
 
 
 			throw new ArgumentException($"Could not create ShiftPolygonCalculator for {name}");