diff --git a/tamper/space2morepound.py b/tamper/space2morepound.py
index 99803fbdc..63a8003e4 100644
--- a/tamper/space2morepound.py
+++ b/tamper/space2morepound.py
@@ -62,6 +62,9 @@ def tamper(payload):
             if payload[i].isspace():
                 randomStr = ''.join(random.choice(string.ascii_uppercase + string.lowercase) for x in range(random.randint(6, 12)))
                 retVal += "%%23%s%%0A" % randomStr
+            elif payload[i] == '#' or payload[i:i+3] == '-- ':
+                retVal += payload[i]
+                break
             else:
                 retVal += payload[i]
 
diff --git a/tamper/space2pound.py b/tamper/space2pound.py
index f3428c08f..bd0d25612 100644
--- a/tamper/space2pound.py
+++ b/tamper/space2pound.py
@@ -48,6 +48,9 @@ def tamper(payload):
             if payload[i].isspace():
                 randomStr = ''.join(random.choice(string.ascii_uppercase + string.lowercase) for x in range(random.randint(6, 12)))
                 retVal += "%%23%s%%0A" % randomStr
+            elif payload[i] == '#' or payload[i:i+3] == '-- ':
+                retVal += payload[i]
+                break
             else:
                 retVal += payload[i]