need to fix an alerts