diff --git a/VectoCore/VectoCore/InputData/Reader/Impl/EngineeringModeVectoRunDataFactory.cs b/VectoCore/VectoCore/InputData/Reader/Impl/EngineeringModeVectoRunDataFactory.cs
index 2396dc4666747cef8a6f87dabe369bc0ad23c876..81672e0310bc0921f001bfeee3c8d72ab173d394 100644
--- a/VectoCore/VectoCore/InputData/Reader/Impl/EngineeringModeVectoRunDataFactory.cs
+++ b/VectoCore/VectoCore/InputData/Reader/Impl/EngineeringModeVectoRunDataFactory.cs
@@ -94,10 +94,9 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
 
 				GearboxData gearboxData = null;
 				ShiftStrategyParameters gearshiftParams = null;
-				AngledriveData angledriveData = null;
+				var angledriveData = dao.CreateAngledriveData(vehicle.Components.AngledriveInputData);
 				if (electricMachinesData.Any(x => x.Item1 == PowertrainPosition.BatteryElectricE2)) {
 					// gearbox required!
-					// todo mk-2021-08-26 angleDrive will always be null!!
 					gearshiftParams = dao.CreateGearshiftData(
 						InputDataProvider.JobInputData.Vehicle.Components.GearboxInputData.Type, InputDataProvider.DriverInputData.GearshiftInputData,
 						axlegearData.AxleGear.Ratio * (angledriveData?.Angledrive.Ratio ?? 1.0), null);
@@ -120,8 +119,6 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
 							AxleGearData = axlegearData,
 							ElectricMachinesData = electricMachinesData
 						}, tmpStrategy);
-					angledriveData = dao.CreateAngledriveData(vehicle.Components.AngledriveInputData);
-					
 				}
 
 				if (gearshiftParams == null) {