BUGFIX: alert handler