added check for '@'