Fixed alert issue