diff --git a/VectoCore/VectoCore/OutputData/FileIO/JSONFileWriter.cs b/VectoCore/VectoCore/OutputData/FileIO/JSONFileWriter.cs
index d74e5936b04e372a22cc2c44fd5aa9c3e33f866e..d72c196e6f3a646ec6985da39dd8a58fef454ecb 100644
--- a/VectoCore/VectoCore/OutputData/FileIO/JSONFileWriter.cs
+++ b/VectoCore/VectoCore/OutputData/FileIO/JSONFileWriter.cs
@@ -154,10 +154,10 @@ public class JSONFileWriter : IOutputFileWriter
 			var currentGear = new Dictionary<string, object> {
 				{ JsonKeys.Gearbox_Gear_Ratio, gear.Ratio }
 			};
-			if(gear.MaxOutputShaftSpeed != null)
+			if(gear.MaxOutputShaftTorque != null)
 				currentGear.Add(JsonKeys.Gearbox_Gear_MaxOutShaftTorque, gear.MaxOutputShaftTorque.Value());
 			if(gear.MaxOutputShaftSpeed != null)
-				currentGear.Add(JsonKeys.Gearbox_Gear_MaxOutShaftSpeed, gear.MaxOutputShaftSpeed.Value());
+				currentGear.Add(JsonKeys.Gearbox_Gear_MaxOutShaftSpeed, gear.MaxOutputShaftSpeed.AsRPM);
 			gears.Add(currentGear);
 		}