diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationMultistageInputData.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationMultistageInputData.cs
index fd9442b0e63ee28ce22c12c54a75fd3841914c4b..ecc5673ce6824eceae68bcd47dc25790466f611a 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationMultistageInputData.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationMultistageInputData.cs
@@ -153,12 +153,15 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
 		public IResult GetResult(VehicleClass vehicleClass, MissionType mission, string fuelMode, Kilogram payload,
 			OvcHevMode ovcHevMode)
 		{
-			return ResultsInputData.Results.FirstOrDefault(
+			var matches = ResultsInputData.Results.Where(
 				x => x.VehicleGroup == vehicleClass &&
 					(x.SimulationParameter.Payload - payload).IsEqual(0, 1) && x.Mission == mission 
-					&& x.OvcMode == ovcHevMode
-				// && x.SimulationParameter.FuelMode.Equals(fuelMode, StringComparison.InvariantCultureIgnoreCase)
-			);
+			).ToArray();
+			if (matches.Length == 1) {
+				return matches.First();
+			}
+
+			return matches.First(x => x.OvcMode == ovcHevMode);
 		}
 
 		public XmlNode ResultsNode => GetNode(XMLNames.Report_Results);
diff --git a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationMode/CompletedBusRunDataFactory/DeclarationModeCompletedBusRunDataFactory.cs b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationMode/CompletedBusRunDataFactory/DeclarationModeCompletedBusRunDataFactory.cs
index 03c99e6191a9c92564881053b72add8f5b2fcb8c..07fd94a0fbf353ad7d68f3efcee2a22aaf03af0b 100644
--- a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationMode/CompletedBusRunDataFactory/DeclarationModeCompletedBusRunDataFactory.cs
+++ b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationMode/CompletedBusRunDataFactory/DeclarationModeCompletedBusRunDataFactory.cs
@@ -362,7 +362,7 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl.DeclarationMode.CompletedBusRun
 							}
 							else
 							{
-								foreach (var run in CreateVectoRunData(mission, loading, modeIdx, fuelMode)) {
+								foreach (var run in CreateVectoRunData(mission, loading, modeIdx, fuelMode, OvcHevMode.ChargeSustaining)) {
 									yield return run;
 								}
 							}