Add back in listener events text check