diff --git a/VECTO/GUI/EngineForm.vb b/VECTO/GUI/EngineForm.vb
index a0161499b033c9fb7734754d48cbcc1f75f98e22..34e679d559085c8c5f6045c22e3377e8755f0b2f 100644
--- a/VECTO/GUI/EngineForm.vb
+++ b/VECTO/GUI/EngineForm.vb
@@ -67,8 +67,21 @@ Public Class EngineForm
 
 		If Not Cfg.DeclMode Then Exit Sub
 
+		Dim gbxType as GearboxType = GearboxType.AMT
+
+		Dim jobFile As String = VectoJobForm.VectoFile
+		If Not jobFile Is Nothing AndAlso File.Exists(jobFile) Then
+
+			Dim inputData As IEngineeringInputDataProvider = TryCast(JSONInputDataFactory.ReadJsonJob(jobFile), 
+																	 IEngineeringInputDataProvider)
+			If (not inputData Is Nothing) Then
+				Dim gbx as IGearboxDeclarationInputData = inputData.JobInputData.Vehicle.GearboxInputData
+				gbxType = gbx.Type
+			End If
+		End If
+	    
 		TbInertia.Text = DeclarationData.Engine.EngineInertia((TbDispl.Text.ToDouble(0.0)/1000.0/1000.0).SI (Of CubicMeter),
-															GearboxType.AMT).ToGUIFormat()
+															gbxType).ToGUIFormat()
 	End Sub
 
 
diff --git a/VECTO/GUI/GearboxForm.vb b/VECTO/GUI/GearboxForm.vb
index c1a30f50dc1e9c01a17ade1c32cd76f70f9c704c..2e72d6382d4564aa140281742f692dd662a9c799 100644
--- a/VECTO/GUI/GearboxForm.vb
+++ b/VECTO/GUI/GearboxForm.vb
@@ -911,9 +911,9 @@ Public Class GearboxForm
 			If (vehicle.Axles.Count < 2) Then
 				Return Nothing
 			End If
-            rdyn = vehicle.Axles.Where(Function(axle)  axle.AxleType = AxleType.VehicleDriven) _
-                .Select(Function(da) DeclarationData.Wheels.Lookup(da.Tyre.Dimension).DynamicTyreRadius) _
-		        .Average()
+			rdyn = vehicle.Axles.Where(Function(axle)  axle.AxleType = AxleType.VehicleDriven) _
+				.Select(Function(da) DeclarationData.Wheels.Lookup(da.Tyre.Dimension).DynamicTyreRadius) _
+				.Average()
 		End If
 		If (rDyn.IsEqual(0)) Then
 			Return Nothing