diff --git a/tamper/randomcomments.py b/tamper/randomcomments.py
index 759972894..b37e5d768 100644
--- a/tamper/randomcomments.py
+++ b/tamper/randomcomments.py
@@ -26,7 +26,7 @@ def tamper(payload, **kwargs):
     retVal = payload
 
     if payload:
-        for match in re.finditer(r"[A-Za-z_]+", payload):
+        for match in re.finditer(r"\b[A-Za-z_]+\b", payload):
             word = match.group()
 
             if len(word) < 2:
@@ -39,6 +39,11 @@ def tamper(payload, **kwargs):
                     _ += "%s%s" % ("/**/" if randomRange(0, 1) else "", word[i])
 
                 _ += word[-1]
+
+                if "/**/" not in _:
+                    index = randomRange(1, len(word) - 1)
+                    _ = word[:index] + "/**/" + word[index:]
+
                 retVal = retVal.replace(word, _)
 
     return retVal