fixed the alerts issue