Alerts Bugfix