Fix for alerts