Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -r5016cb7de01291976a89a43b03ab755b534f0889 -rb7a2bdf2fd5e6f804218cc6e6b63f972969a5b5e
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 5016cb7de01291976a89a43b03ab755b534f0889)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision b7a2bdf2fd5e6f804218cc6e6b63f972969a5b5e)
@@ -593,15 +593,15 @@
         {
             ALARM_PRIORITY_T almPriority = ALARM_TABLE[ a ].alarmPriority;
             U32 subRank = ALARM_TABLE[ a ].alarmSubRank;
-            U32 msSinceTriggered = getAlarmStartTime( a );
+            U32 msSinceTriggered = calcTimeSince( getAlarmStartTime( a ) );
 
             // see if this alarm is higher rank than highest active alarm in this priority category so far
-            if ( subRank <= alarmPriorityFIFO[ a ].subRank )
+            if ( subRank <= alarmPriorityFIFO[ almPriority ].subRank )
             {
                 // if sub-rank is a tie, see which alarm was triggered first
-                if ( subRank == alarmPriorityFIFO[ a ].subRank )
+                if ( subRank == alarmPriorityFIFO[ almPriority ].subRank )
                 {
-                    if ( msSinceTriggered > alarmPriorityFIFO[ a ].timeSinceTriggeredMS )
+                    if ( msSinceTriggered > alarmPriorityFIFO[ almPriority ].timeSinceTriggeredMS )
                     {
                         alarmPriorityFIFO[ almPriority ].alarmID = a;
                         alarmPriorityFIFO[ almPriority ].subRank = subRank;