diff --git a/csharp/App/SaliMax/src/Program.cs b/csharp/App/SaliMax/src/Program.cs
index dc805a914..873b8faa7 100644
--- a/csharp/App/SaliMax/src/Program.cs
+++ b/csharp/App/SaliMax/src/Program.cs
@@ -428,16 +428,23 @@ internal static class Program
 
        if (record.Battery != null)
        {
-           foreach (var alarm in record.Battery.Alarms)
+           var i = 0;
+           
+           foreach (var battery in record.Battery.Devices)
            {
-               alarmList.Add(new AlarmOrWarning
+               i++;
+               foreach (var alarm in battery.Alarms)
                {
-                   Date = DateTime.Now.ToString("yyyy-MM-dd"),
-                   Time = DateTime.Now.ToString("HH:mm:ss"),
-                   CreatedBy = "Battery",
-                   Description = alarm
-               });
+                   alarmList.Add(new AlarmOrWarning
+                   {
+                       Date = DateTime.Now.ToString("yyyy-MM-dd"),
+                       Time = DateTime.Now.ToString("HH:mm:ss"),
+                       CreatedBy = "Battery" + i,
+                       Description = alarm
+                   });
+               }
            }
+           
        }
        
        foreach (var warning in record.AcDc.Warnings)