diff --git a/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs b/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs
index ace82db767ceba4ebaee4b1f4f573911c214bffb..966448ffbe99356113e36ab373c017d9f42b81b1 100644
--- a/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs
+++ b/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs
@@ -542,8 +542,8 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
 			var container = new VehicleContainer(data.ExecutionMode, modData, sumWriter) { RunData = data };
 			var es = ConnectREESS(data, container);
 			var strategy = data.GearboxData != null && data.GearboxData.Type.AutomaticTransmission()
-				? (IHybridControlStrategy)new SerialHybridStrategy<APTNGearbox>(data, container)
-				: new SerialHybridStrategy<Gearbox>(data, container);
+				? (IHybridControlStrategy)new SerialHybridStrategyAT(data, container)
+				: new SerialHybridStrategy(data, container);
 
 			var aux = new ElectricAuxiliary(container);
 			aux.AddConstant("P_aux_el", data.ElectricAuxDemand ?? 0.SI<Watt>());
@@ -957,7 +957,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
 			var container = new VehicleContainer(data.ExecutionMode, modData, _sumWriter) { RunData = data };
 			var es = ConnectREESS(data, container);
 
-			var strategy = new SerialHybridStrategy<Gearbox>(data, container);
+			var strategy = new SerialHybridStrategy(data, container);
 			var ctl = new SerialHybridController(container, strategy, es);
 
 			var engine = new StopStartCombustionEngine(container, data.EngineData);
diff --git a/VectoCore/VectoCoreTest/Integration/Hybrid/SerialHybridTest.cs b/VectoCore/VectoCoreTest/Integration/Hybrid/SerialHybridTest.cs
index 24cc137eb5d3700450f8740cb01fc0719ae22ef2..8a6f72a615e5c2fbcbc15c96d537d798105d47dd 100644
--- a/VectoCore/VectoCoreTest/Integration/Hybrid/SerialHybridTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/Hybrid/SerialHybridTest.cs
@@ -684,7 +684,7 @@ namespace TUGraz.VectoCore.Tests.Integration.Hybrid
 			var container = new VehicleContainer(ExecutionMode.Engineering, modData, 
 				x => { sumData?.Write(x, 1, 1, runData); }) { RunData = runData };
 
-			var strategy = new SerialHybridStrategy<Gearbox>(runData, container);
+			var strategy = new SerialHybridStrategy(runData, container);
 			var es = new ElectricSystem(container);
 			var battery = new BatterySystem(container, batteryData);
 			battery.Initialize(initialBatCharge);