diff --git a/VectoCore/VectoCore/Models/Declaration/DeclarationData.cs b/VectoCore/VectoCore/Models/Declaration/DeclarationData.cs
index b3ed546a3f8044b3f69ec46a9a4b17f1082f45a7..6bc99bd147dc16a613913594db03a322d7cad9d0 100644
--- a/VectoCore/VectoCore/Models/Declaration/DeclarationData.cs
+++ b/VectoCore/VectoCore/Models/Declaration/DeclarationData.cs
@@ -428,9 +428,9 @@ namespace TUGraz.VectoCore.Models.Declaration
 
 					case BusHVACSystemConfiguration.Configuration3 when !hasDriverHP && !hasPassengerHP:
 						return BusHVACSystemConfiguration.Configuration3;
+
 					case BusHVACSystemConfiguration.Configuration4 when !hasDriverHP && !hasPassengerHP:
 						return BusHVACSystemConfiguration.Configuration3;
-
 					case BusHVACSystemConfiguration.Configuration4 when hasDriverHP && !hasPassengerHP:
 						return BusHVACSystemConfiguration.Configuration4;
 
@@ -456,21 +456,21 @@ namespace TUGraz.VectoCore.Models.Declaration
 					case BusHVACSystemConfiguration.Configuration8 when !hasDriverHP && !hasPassengerHP:
 						return BusHVACSystemConfiguration.Configuration3;
 					case BusHVACSystemConfiguration.Configuration8 when !hasDriverHP && hasPassengerHP:
-						return BusHVACSystemConfiguration.Configuration5;
+						return BusHVACSystemConfiguration.Configuration8;
 
 					case BusHVACSystemConfiguration.Configuration9 when !hasDriverHP && !hasPassengerHP:
 						return BusHVACSystemConfiguration.Configuration3;
 					case BusHVACSystemConfiguration.Configuration9 when hasDriverHP && !hasPassengerHP:
 						return BusHVACSystemConfiguration.Configuration4;
 					case BusHVACSystemConfiguration.Configuration9 when !hasDriverHP && hasPassengerHP:
-						return BusHVACSystemConfiguration.Configuration5;
+						return BusHVACSystemConfiguration.Configuration8;
 					case BusHVACSystemConfiguration.Configuration9 when hasDriverHP && hasPassengerHP:
-						return BusHVACSystemConfiguration.Configuration7;
+						return BusHVACSystemConfiguration.Configuration9;
 
 					case BusHVACSystemConfiguration.Configuration10 when !hasDriverHP && !hasPassengerHP:
 						return BusHVACSystemConfiguration.Configuration3;
 					case BusHVACSystemConfiguration.Configuration10 when !hasDriverHP && hasPassengerHP:
-						return BusHVACSystemConfiguration.Configuration6;
+						return BusHVACSystemConfiguration.Configuration10;
 				}
 				throw new VectoException($"Invalid HVAC combination! System Configuration: {hvacConfigurationInput.GetName()}, Driver HeatPump: {heatPumpDriver.GetLabel()}, Passenger HeatPump: {heatPumpPassenger.GetLabel()}");
 			}