bug fix for "@" handling.