diff --git a/VectoCore/VectoCore/Models/BusAuxiliaries/BusAuxiliaries.cs b/VectoCore/VectoCore/Models/BusAuxiliaries/BusAuxiliaries.cs
index 830ca75cd998b320297dd374373aec0cda4bf5a3..8dbe91b345f5d577873a5d14790eb724f43d1550 100644
--- a/VectoCore/VectoCore/Models/BusAuxiliaries/BusAuxiliaries.cs
+++ b/VectoCore/VectoCore/Models/BusAuxiliaries/BusAuxiliaries.cs
@@ -289,7 +289,7 @@ namespace TUGraz.VectoCore.Models.BusAuxiliaries
 					var energy = (generatedElPower - ElectricPowerConsumerSum) * essFactor * seconds;
 					var maxCharge = (ElectricStorage.SOC - 1) * ElectricStorage.Capacity;
 					var maxDischarge = ElectricStorage.SOC * ElectricStorage.Capacity;
-					var batEnergy = energy.LimitTo(maxCharge, maxDischarge);
+					var batEnergy = energy.LimitTo(-maxDischarge, -maxCharge);
 					ElectricStorage.Request(batEnergy);
 				}
 				Signals.CurrentCycleTimeInSeconds += seconds.Value();
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/BusAuxiliariesAdapter.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/BusAuxiliariesAdapter.cs
index 0212cc41b9c1760bee98f058cd6c5e4bfca10285..d4ca2148cf23aa5fa58c46db248e71b1738cfc29 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/BusAuxiliariesAdapter.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/BusAuxiliariesAdapter.cs
@@ -201,7 +201,8 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 			if (SmartElectricSystem) {
 				container[ModalResultField.BatterySOC] = Auxiliaries.BatterySOC * 100.0;
 
-				container[ModalResultField.P_busAux_ES_generated] = essUtilityFactor * Auxiliaries.ElectricPowerConsumerSum;
+
+				container[ModalResultField.P_busAux_ES_generated] = essUtilityFactor * (DataBus.VehicleStopped ? Auxiliaries.ElectricPowerConsumerSum : Auxiliaries.ElectricPowerGenerated);
 				container[ModalResultField.P_busAux_ES_sum_mech] = essUtilityFactor * Auxiliaries.ElectricPowerConsumerSum /
 																	AuxCfg.ElectricalUserInputsConfig.AlternatorGearEfficiency /
 																	AuxCfg.ElectricalUserInputsConfig.AlternatorMap.GetEfficiency(0.RPMtoRad(), 0.SI<Ampere>());