Fixed alert/notice issue