diff --git a/csharp/App/SodiStoreMax/src/Program.cs b/csharp/App/SodiStoreMax/src/Program.cs
index dcb68edb4..1b460898e 100644
--- a/csharp/App/SodiStoreMax/src/Program.cs
+++ b/csharp/App/SodiStoreMax/src/Program.cs
@@ -540,9 +540,11 @@ internal static class Program
         // Deligreen upper current limitation dynCCL
         if (r.DcDc.Devices.Count != 0 && r.Battery?.MonomerHighVoltageAlarm == true )
         {
-            maxBatteryChargingCurrentLive = (r.Battery.Devices.Count * 10)/ r.DcDc.Devices.Count ;  // Max charging current is 10 A * Number of batteries
-            maxBatteryChargingCurrentLive.WriteLine("dynCCL Active: Max Battery Charging is "+ maxBatteryChargingCurrentLive);
+            var availableBattries = r.Battery?.AvailableChBatteries;
+            availableBattries?.WriteLine(" Available ChBatteries");
             
+            maxBatteryChargingCurrentLive = (10 * availableBattries.Value)/ r.DcDc.Devices.Count ;  // Max charging current is 10 A * Number of batteries
+            Console.WriteLine("dynCCL Active: Max Battery Charging is "+ maxBatteryChargingCurrentLive);
         }
         else
         {