fixed notify and alert