And another fix for alarm event