fixed alert issues