Fix for alerting