diff --git a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/MultistageAuxiliariesViewModel.cs b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/MultistageAuxiliariesViewModel.cs
index 24d013f4105c409cfcfdf74e4f90a5dcd7543a77..4744da5fe314f4e04ff9386472f657c4a209180b 100644
--- a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/MultistageAuxiliariesViewModel.cs
+++ b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/MultistageAuxiliariesViewModel.cs
@@ -146,7 +146,18 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
 		public bool HeatPumpGroupEditingEnabled
 		{
 			get => _heatPumpGroupEditingEnabled;
-			set => SetProperty(ref _heatPumpGroupEditingEnabled, value);
+			set
+			{
+				
+				SetProperty(ref _heatPumpGroupEditingEnabled, value);
+				//if (value == false)
+				//{
+				//	HeatPumpTypePassengerCompartment = null;
+				//	HeatPumpModePassengerCompartment = null;
+				//	HeatPumpModeDriverCompartment = null;
+				//	HeatPumpTypeDriverCompartment = null;
+				//}
+			}
 		}
 
 		public BusHVACSystemConfiguration? SystemConfiguration
@@ -163,12 +174,12 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
 				if (value == HeatPumpType.none) {
 					HeatPumpModeDriverCompartmentAllowedValues =
 						EnumHelper.GetValuesAsObservableCollectionIncluding<Enum, HeatPumpMode>(items:HeatPumpMode.N_A);
-					HeatPumpModeDriverCompartment = HeatPumpMode.N_A;
+					//HeatPumpModeDriverCompartment = HeatPumpMode.N_A;
 				} else {
 					HeatPumpModeDriverCompartmentAllowedValues =
 						EnumHelper.GetValuesAsObservableCollectionExcluding<Enum, HeatPumpMode>(
 							items: HeatPumpMode.N_A);
-					HeatPumpModeDriverCompartment = HeatPumpMode.cooling;
+					//HeatPumpModeDriverCompartment = HeatPumpMode.cooling;
 				}
 
 
@@ -213,14 +224,14 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
 				{
 					HeatPumpModePassengerCompartmentAllowedValues =
 						EnumHelper.GetValuesAsObservableCollectionIncluding<Enum, HeatPumpMode>(items: HeatPumpMode.N_A);
-					HeatPumpModePassengerCompartment = HeatPumpMode.N_A;
+					//HeatPumpModePassengerCompartment = HeatPumpMode.N_A;
 				}
 				else
 				{
 					HeatPumpModePassengerCompartmentAllowedValues =
 						EnumHelper.GetValuesAsObservableCollectionExcluding<Enum, HeatPumpMode>(
 							items: HeatPumpMode.N_A);
-					HeatPumpModePassengerCompartment = HeatPumpMode.cooling;
+					//HeatPumpModePassengerCompartment = HeatPumpMode.cooling;
 				}
 			}
 		}
diff --git a/VectoCommon/VectoCommon/BusAuxiliaries/ISSMInputs.cs b/VectoCommon/VectoCommon/BusAuxiliaries/ISSMInputs.cs
index 635fa22f1ffbf8ced19beecffa6cc65ec9067e56..49ad17abef414b63927c1c4f9f2a41e33cb475bc 100644
--- a/VectoCommon/VectoCommon/BusAuxiliaries/ISSMInputs.cs
+++ b/VectoCommon/VectoCommon/BusAuxiliaries/ISSMInputs.cs
@@ -255,7 +255,7 @@ namespace TUGraz.VectoCommon.BusAuxiliaries
 		heating_and_cooling,
 		[GuiLabel("Cooling")]
 		cooling,
-		[GuiLabel("N_A")]
+		[GuiLabel("not_applicable")]
 		N_A,
 	}