Properly return all alarms
Merge pull request #1455 from trotter/fix-alarms

Properly return all alarms