diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/PEVAMTShiftStrategy.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/PEVAMTShiftStrategy.cs
index 57fc97308860b97a59cede651c670f85d9c45778..a55790cf0d572243335e39cacb1aa2cfbea7eaf4 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/PEVAMTShiftStrategy.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/PEVAMTShiftStrategy.cs
@@ -50,14 +50,15 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 
 		public PEVAMTShiftStrategy(IVehicleContainer dataBus)
 		{
+			GearboxModelData = dataBus.RunData.GearboxData;
+			GearshiftParams = dataBus.RunData.GearshiftParameters;
+			GearList = GearboxModelData.GearList;
 			MaxStartGear = GearList.Reverse().First();
 			var runData = dataBus.RunData;
 			if (runData.VehicleData == null) {
 				return;
 			}
-			GearboxModelData = dataBus.RunData.GearboxData;
-			GearshiftParams = dataBus.RunData.GearshiftParameters;
-			GearList = GearboxModelData.GearList;
+			
 
 			PowerMap = dataBus.RunData.ElectricMachinesData
 				.FirstOrDefault(x => x.Item1 == PowertrainPosition.BatteryElectricE2)?.Item2.EfficiencyMap;