diff --git a/VectoCore/VectoCore/Models/GenericModelData/GenericBusElectricMotorData.cs b/VectoCore/VectoCore/Models/GenericModelData/GenericBusElectricMotorData.cs
index 85b896e6c0d13b1abeeab4a5dbdaa72f49725a25..19d1e6d795dedeba1486e742ba0bcae64c95b0f0 100644
--- a/VectoCore/VectoCore/Models/GenericModelData/GenericBusElectricMotorData.cs
+++ b/VectoCore/VectoCore/Models/GenericModelData/GenericBusElectricMotorData.cs
@@ -214,7 +214,7 @@ namespace TUGraz.VectoCore.Models.GenericModelData
 				var powerElectrical = row.ParseDouble(PowerElectricalNorm) * ratedPoint.PRated;
 
 				var newRow = result.NewRow();
-				newRow[ElectricMotorMapReader.Fields.MotorSpeed] = Math.Round(motorSpeed.Value(), 2, MidpointRounding.AwayFromZero).SI<PerSecond>().AsRPM.ToXMLFormat(2);
+				newRow[ElectricMotorMapReader.Fields.MotorSpeed] = Math.Round(motorSpeed.AsRPM, 2, MidpointRounding.AwayFromZero).ToXMLFormat(2);
 				newRow[ElectricMotorMapReader.Fields.Torque] = Math.Round(torque.Value(), 2, MidpointRounding.AwayFromZero).ToXMLFormat(2);
 				newRow[ElectricMotorMapReader.Fields.PowerElectrical] = Math.Round(powerElectrical.Value(), 2, MidpointRounding.AwayFromZero).ToXMLFormat(2);
 				result.Rows.Add(newRow);
diff --git a/VectoCore/VectoCore/Models/GenericModelData/GenericBusIHPCData.cs b/VectoCore/VectoCore/Models/GenericModelData/GenericBusIHPCData.cs
index 645737fe06926da86e2ee74b8277ed71fda5a67a..d5e4e4cb02fa953dcae66b781bae75a9f3b6f92e 100644
--- a/VectoCore/VectoCore/Models/GenericModelData/GenericBusIHPCData.cs
+++ b/VectoCore/VectoCore/Models/GenericModelData/GenericBusIHPCData.cs
@@ -123,7 +123,7 @@ namespace TUGraz.VectoCore.Models.GenericModelData
 				var powerElectrical = row.ParseDouble(PowerElectricalNorm) * ratedPoint.PRated;
 
 				var newRow = result.NewRow();
-				newRow[ElectricMotorMapReader.Fields.MotorSpeed] = Math.Round(motorSpeed.Value(), 2, MidpointRounding.AwayFromZero).ToXMLFormat(2);
+				newRow[ElectricMotorMapReader.Fields.MotorSpeed] = Math.Round(motorSpeed.AsRPM, 2, MidpointRounding.AwayFromZero).ToXMLFormat(2);
 				newRow[ElectricMotorMapReader.Fields.Torque] = Math.Round(torque.Value(), 2, MidpointRounding.AwayFromZero).ToXMLFormat(2);
 				newRow[ElectricMotorMapReader.Fields.PowerElectrical] = Math.Round(powerElectrical.Value(), 2, MidpointRounding.AwayFromZero).ToXMLFormat(2);
 				result.Rows.Add(newRow);