fixed alert stuff