make at symbols optional