Fixing alert issue