diff --git a/Generic Vehicles/Declaration Mode/12t Delivery Truck/12t Delivery Truck.vmap b/Generic Vehicles/Declaration Mode/12t Delivery Truck/12t Delivery Truck.vmap
index f7ad107b968d22126c862db3a0d24a78c7ba3f14..8d0ccfd038e234717b6cd5b95d91ab5b2b62e883 100644
--- a/Generic Vehicles/Declaration Mode/12t Delivery Truck/12t Delivery Truck.vmap	
+++ b/Generic Vehicles/Declaration Mode/12t Delivery Truck/12t Delivery Truck.vmap	
@@ -183,4 +183,6 @@ engine speed [1/min],torque [Nm],fuel consumption [g/h]
 2600,400,23315
 2600,480,28351
 2700,-150,0
-2700,0,5900
\ No newline at end of file
+2700,0,5900
+3000,1200,40000
+600,1200,40000
\ No newline at end of file
diff --git a/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.vmap b/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.vmap
index 26c035cad9373137a6be4195e75a204b3625a22c..a201ed96fb030c871f8d13df05a11556b3e8a317 100644
--- a/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.vmap	
+++ b/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.vmap	
@@ -111,3 +111,5 @@
 2100,800,35717
 2100,1000,45643
 2100,1100,50653
+2100,2400,60000
+560,2400,60000
\ No newline at end of file
diff --git a/Generic Vehicles/Declaration Mode/40t Long Haul Truck/Direct Gear.vtlm b/Generic Vehicles/Declaration Mode/40t Long Haul Truck/Direct Gear.vtlm
index fa171bece8e04fad0fd78574764f3a4f17465444..5edeb690649e881d3604440136e1af4e1aa8ecd2 100644
--- a/Generic Vehicles/Declaration Mode/40t Long Haul Truck/Direct Gear.vtlm	
+++ b/Generic Vehicles/Declaration Mode/40t Long Haul Truck/Direct Gear.vtlm	
@@ -191,3 +191,4 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
 1700,-1000,18.662
 1900,-1000,19.674
 2100,-1000,20.686
+0,0,0
\ No newline at end of file
diff --git a/Generic Vehicles/Declaration Mode/40t Long Haul Truck/Indirect Gear.vtlm b/Generic Vehicles/Declaration Mode/40t Long Haul Truck/Indirect Gear.vtlm
index 0198efcc3633373b82fdd76362e1b2080f0dbd1e..26b819e032cf682602a35cb03d83ff05aade29fb 100644
--- a/Generic Vehicles/Declaration Mode/40t Long Haul Truck/Indirect Gear.vtlm	
+++ b/Generic Vehicles/Declaration Mode/40t Long Haul Truck/Indirect Gear.vtlm	
@@ -191,3 +191,4 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
 1700,-1000,33.662
 1900,-1000,34.674
 2100,-1000,35.686
+0,0,0
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/Gearbox/TransmissionLossMap.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/Gearbox/TransmissionLossMap.cs
index a5c2988fffdf2d25bbe9d59ca9ebb0ddbf53a1d3..86e0c3978ce18e1ebea7dd8730eef23c4280e0c0 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Data/Gearbox/TransmissionLossMap.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Data/Gearbox/TransmissionLossMap.cs
@@ -64,6 +64,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data.Gearbox
 		public bool Extrapolated
 		{
 			get { return _lossMap.Extrapolated; }
+			set { _lossMap.Extrapolated = value; }
 		}
 
 		public string GearName { get; private set; }
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Gearbox.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Gearbox.cs
index b4930376aec6f4a6db3e66b6e5f0566159e33c06..d20b7faee1ebb223e8c7e5b24002e22e5a1932bb 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Gearbox.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Gearbox.cs
@@ -448,6 +448,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 				Disengaged = false;
 				_engageTime = -double.MaxValue.SI<Second>();
 			}
+			ModelData.Gears[Gear].LossMap.Extrapolated = false;
 			AdvanceState();
 		}