diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/ElectricMotor.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/ElectricMotor.cs
index 7645f3f5752121a6b3201cc67f29f030768ad2ca..6c149b20bac7ee5f671b7125bde64c99dda04f50 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/ElectricMotor.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/ElectricMotor.cs
@@ -102,6 +102,9 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 			var maxBatPower = electricSystemResponse.MaxPowerDrive;
 
 			var maxBatDriveTorque = maxBatPower.IsEqual(0) ? ModelData.DragCurve.Lookup(avgSpeed) : ModelData.EfficiencyMap.LookupTorque(maxBatPower, avgSpeed, maxEmTorque);
+			//if (maxBatDriveTorque == null) {
+			//	return ModelData.DragCurve.Lookup(avgSpeed);
+			//}
 			var maxTorqueDrive = VectoMath.Max(maxEmTorque, maxBatDriveTorque);
 			return maxTorqueDrive > 0 ? null : maxTorqueDrive;
 		}