fix alert issue