Fix to use alarmIDs