Fixed double alert bugs