diff --git a/golded3/gemsgs.cpp b/golded3/gemsgs.cpp
index 0fa4251..a3630c0 100644
--- a/golded3/gemsgs.cpp
+++ b/golded3/gemsgs.cpp
@@ -50,7 +50,7 @@ static bool tokenxchg(std::string &input, std::string::iterator &pos,
   size_t toklen = strlen(tok);
   const char* inp_str_tok=it2str(input, pos);
 
-  if ( (strnieql(inp_str_tok, tok, toklen)) && isspace(inp_str_tok[toklen]) )
+  if ( (strnieql(inp_str_tok, tok, toklen)) && (isspace(inp_str_tok[toklen]) || ispunct(inp_str_tok[toklen])) )
   {
     std::string str = src;
     std::string::iterator tokend = pos+toklen;