Fix the alert bug for now