Fix for alerts in fa