Fixed a text and alert issue