diff --git a/VectoMockup/VectoMockup/Simulation/RundataFactories/PrimaryBusMockupRunDataFactory.cs b/VectoMockup/VectoMockup/Simulation/RundataFactories/PrimaryBusMockupRunDataFactory.cs
index a67489d8ef7e1da1406ac161701ea42730c6dd0e..09f063d502869f0e63a73630b0c4cae66b9a99d4 100644
--- a/VectoMockup/VectoMockup/Simulation/RundataFactories/PrimaryBusMockupRunDataFactory.cs
+++ b/VectoMockup/VectoMockup/Simulation/RundataFactories/PrimaryBusMockupRunDataFactory.cs
@@ -77,7 +77,7 @@ namespace TUGraz.VectoMockup.Simulation.RundataFactories
 					Exempted = true,
 					Report = Report,
 					Mission = new Mission() { MissionType = MissionType.ExemptedMission },
-					VehicleData = CreateMockupVehicleData(vehicle, _segment, loading),
+					VehicleData = CreateExemptedMockupVehicleData(vehicle, _segment),
 					InputDataHash = InputDataProvider.XMLHash
 				};
 				runData.VehicleData.InputData = vehicle;
@@ -117,8 +117,7 @@ namespace TUGraz.VectoMockup.Simulation.RundataFactories
         }
 
 
-
-        #endregion
+		#endregion
 
         #endregion
         public static IAuxiliaryConfig CreateMockupBusAux(IVehicleDeclarationInputData vehicle)
@@ -275,6 +274,29 @@ namespace TUGraz.VectoMockup.Simulation.RundataFactories
             };
         }
 
+		private VehicleData CreateExemptedMockupVehicleData(IVehicleDeclarationInputData vehicleData, Segment segment)
+		{
+			return new VehicleData() {
+				InputData = vehicleData,
+				SleeperCab = vehicleData.SleeperCab,
+				//Loading = loading.Value.Item1,
+				VehicleClass = segment.VehicleClass,
+				Ocv = vehicleData.OvcHev,
+				VehicleCategory = vehicleData.VehicleCategory,
+				ZeroEmissionVehicle = vehicleData.ZeroEmissionVehicle,
+				//ADAS = CreateMockupAdasData(vehicleData),
+
+				Manufacturer = vehicleData.Manufacturer,
+				ManufacturerAddress = vehicleData.ManufacturerAddress,
+				ModelName = vehicleData.Model,
+				VIN = vehicleData.VIN,
+				LegislativeClass = vehicleData.LegislativeClass,
+				AxleConfiguration = vehicleData.AxleConfiguration,
+				Date = vehicleData.Date,
+
+			};
+		}
+
         public static VehicleData CreateMockupVehicleData(IVehicleDeclarationInputData vehicleData, Segment segment,
 			KeyValuePair<LoadingType, Tuple<Kilogram, double?>> loading)
         {