diff --git a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationMode/HeavyLorryRunDataFactory/DeclarationModeHeavyLorryRunDataFactory.cs b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationMode/HeavyLorryRunDataFactory/DeclarationModeHeavyLorryRunDataFactory.cs index 432d96ee8e993175c08e98849dd2ff84d6f6c795..ea0b4680eb88c4ef51e8293699a7fef2da3280f3 100644 --- a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationMode/HeavyLorryRunDataFactory/DeclarationModeHeavyLorryRunDataFactory.cs +++ b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationMode/HeavyLorryRunDataFactory/DeclarationModeHeavyLorryRunDataFactory.cs @@ -194,9 +194,9 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl.DeclarationMode.HeavyLorryRunDa protected Segment GetSegment(IVehicleDeclarationInputData vehicle, bool batteryElectric = false) { _allowVocational = true; - var ng = vehicle.Components.EngineInputData?.EngineModes.Any(e => + var ng = vehicle.ExemptedVehicle ? false : vehicle.Components.EngineInputData?.EngineModes.Any(e => e.Fuels.Any(f => f.FuelType.IsOneOf(FuelType.LPGPI, FuelType.NGCI, FuelType.NGPI))) ?? false; - var ovcHev = vehicle.OvcHev; + var ovcHev = vehicle.ExemptedVehicle ? false : vehicle.OvcHev; Segment segment; try {