Add condition for @ characters