fixed alert handling details