Fixed double alert issue