Alarm bug fix