Fixes the alert issues