Minor change on alarm logic