fix wrap comma separated token