Fix allert system