diff --git a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationVTPModeVectoRunDataFactory.cs b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationVTPModeVectoRunDataFactory.cs
index ae81e4e07179c55225575e2bd72c11f7290aa7d9..6dda74fa9d0b947071341c61768871bfd0bd39f3 100644
--- a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationVTPModeVectoRunDataFactory.cs
+++ b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationVTPModeVectoRunDataFactory.cs
@@ -128,12 +128,17 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
 			var tempVehicle = Dao.CreateVehicleData(
 				vehicle, Segment.Missions.First(),
 				Segment.Missions.First().Loadings.First());
+
+			var vtpMission = Segment.VehicleClass.IsMediumLorry()
+				? DeclarationData.VTPMode.SelectedMissionMediumLorry
+				: DeclarationData.VTPMode.SelectedMissionHeavyLorry;
+
 			AirdragData = Dao.CreateAirdragData(
 				vehicle.Components.AirdragInputData,
 				Segment.Missions.First(), Segment);
 			EngineData = Dao.CreateEngineData(
 				vehicle, vehicle.Components.EngineInputData.EngineModes.First(),
-				new Mission() { MissionType = MissionType.LongHaul });
+				new Mission() { MissionType = vtpMission });
 			AxlegearData = JobInputData.Vehicle.Components.GearboxInputData.DifferentialIncluded
 				? Dao.CreateDummyAxleGearData(JobInputData.Vehicle.Components.GearboxInputData)
 				: Dao.CreateAxleGearData(vehicle.Components.AxleGearInputData);