Fixed a critical bug with the alarms being removed/re-added continuously