diff --git a/lib/core/agent.py b/lib/core/agent.py
index bbd90466f..e2c8eac70 100644
--- a/lib/core/agent.py
+++ b/lib/core/agent.py
@@ -274,7 +274,7 @@ class Agent(object):
             where = kb.injection.data[kb.technique].where if where is None else where
             comment = kb.injection.data[kb.technique].comment if comment is None else comment
 
-        if Backend.getIdentifiedDbms() == DBMS.ACCESS and comment == GENERIC_SQL_COMMENT:
+        if Backend.getIdentifiedDbms() == DBMS.ACCESS and "--" in comment:
             comment = queries[DBMS.ACCESS].comment.query
 
         if comment is not None:
@@ -297,7 +297,7 @@ class Agent(object):
         _ = (
                 ("[DELIMITER_START]", kb.chars.start), ("[DELIMITER_STOP]", kb.chars.stop),\
                 ("[AT_REPLACE]", kb.chars.at), ("[SPACE_REPLACE]", kb.chars.space), ("[DOLLAR_REPLACE]", kb.chars.dollar),\
-                ("[HASH_REPLACE]", kb.chars.hash_),
+                ("[HASH_REPLACE]", kb.chars.hash_), ("[GENERIC_SQL_COMMENT]", GENERIC_SQL_COMMENT)
             )
         payload = reduce(lambda x, y: x.replace(y[0], y[1]), _, payload)
 
diff --git a/lib/core/settings.py b/lib/core/settings.py
index 99eb7b8a4..ea4efeed6 100644
--- a/lib/core/settings.py
+++ b/lib/core/settings.py
@@ -20,7 +20,7 @@ from lib.core.enums import OS
 from lib.core.revision import getRevisionNumber
 
 # sqlmap version (<major>.<minor>.<month>.<monthly commit>)
-VERSION = "1.0.4.6"
+VERSION = "1.0.4.7"
 REVISION = getRevisionNumber()
 STABLE = VERSION.count('.') <= 2
 VERSION_STRING = "sqlmap/%s#%s" % (VERSION, "stable" if STABLE else "dev")
@@ -578,7 +578,7 @@ MAX_BISECTION_LENGTH = 50 * 1024 * 1024
 LARGE_CHUNK_TRIM_MARKER = "__TRIMMED_CONTENT__"
 
 # Generic SQL comment formation
-GENERIC_SQL_COMMENT = "-- -"
+GENERIC_SQL_COMMENT = "-- [RANDSTR]"
 
 # Threshold value for turning back on time auto-adjustment mechanism
 VALID_TIME_CHARS_RUN_THRESHOLD = 100
diff --git a/xml/boundaries.xml b/xml/boundaries.xml
index a0731df2b..264eb88e8 100644
--- a/xml/boundaries.xml
+++ b/xml/boundaries.xml
@@ -89,7 +89,7 @@ Formats:
         <where>1,2</where>
         <ptype>2</ptype>
         <prefix>')</prefix>
-        <suffix></suffix>
+        <suffix>[GENERIC_SQL_COMMENT]</suffix>
     </boundary>
 
     <boundary>
@@ -98,7 +98,7 @@ Formats:
         <where>1,2</where>
         <ptype>2</ptype>
         <prefix>'</prefix>
-        <suffix></suffix>
+        <suffix>[GENERIC_SQL_COMMENT]</suffix>
     </boundary>
 
     <boundary>
@@ -107,7 +107,7 @@ Formats:
         <where>1,2</where>
         <ptype>4</ptype>
         <prefix>"</prefix>
-        <suffix></suffix>
+        <suffix>[GENERIC_SQL_COMMENT]</suffix>
     </boundary>
     <!-- End of generic boundaries -->
 
@@ -406,7 +406,7 @@ Formats:
         <where>1,2</where>
         <ptype>1</ptype>
         <prefix></prefix>
-        <suffix>-- [RANDSTR]</suffix>
+        <suffix>[GENERIC_SQL_COMMENT]</suffix>
     </boundary>
 
     <boundary>
@@ -426,7 +426,7 @@ Formats:
         <where>1,2</where>
         <ptype>2</ptype>
         <prefix>') WHERE [RANDNUM]=[RANDNUM]</prefix>
-        <suffix>-- </suffix>
+        <suffix>[GENERIC_SQL_COMMENT]</suffix>
     </boundary>
 
     <boundary>
@@ -435,7 +435,7 @@ Formats:
         <where>1,2</where>
         <ptype>2</ptype>
         <prefix>") WHERE [RANDNUM]=[RANDNUM]</prefix>
-        <suffix>-- </suffix>
+        <suffix>[GENERIC_SQL_COMMENT]</suffix>
     </boundary>
 
     <boundary>
@@ -444,7 +444,7 @@ Formats:
         <where>1,2</where>
         <ptype>1</ptype>
         <prefix>) WHERE [RANDNUM]=[RANDNUM]</prefix>
-        <suffix>-- </suffix>
+        <suffix>[GENERIC_SQL_COMMENT]</suffix>
     </boundary>
 
     <boundary>
@@ -453,7 +453,7 @@ Formats:
         <where>1,2</where>
         <ptype>2</ptype>
         <prefix>' WHERE [RANDNUM]=[RANDNUM]</prefix>
-        <suffix>-- </suffix>
+        <suffix>[GENERIC_SQL_COMMENT]</suffix>
     </boundary>
 
     <boundary>
@@ -462,7 +462,7 @@ Formats:
         <where>1,2</where>
         <ptype>4</ptype>
         <prefix>" WHERE [RANDNUM]=[RANDNUM]</prefix>
-        <suffix>-- </suffix>
+        <suffix>[GENERIC_SQL_COMMENT]</suffix>
     </boundary>
 
     <boundary>
@@ -471,7 +471,7 @@ Formats:
         <where>1,2</where>
         <ptype>1</ptype>
         <prefix> WHERE [RANDNUM]=[RANDNUM]</prefix>
-        <suffix>-- </suffix>
+        <suffix>[GENERIC_SQL_COMMENT]</suffix>
     </boundary>
     <!-- End of pre-WHERE generic boundaries -->
 
@@ -482,7 +482,7 @@ Formats:
         <where>1,2</where>
         <ptype>2</ptype>
         <prefix>')) AS [RANDSTR] WHERE [RANDNUM]=[RANDNUM]</prefix>
-        <suffix>-- </suffix>
+        <suffix>[GENERIC_SQL_COMMENT]</suffix>
     </boundary>
 
     <boundary>
@@ -491,7 +491,7 @@ Formats:
         <where>1,2</where>
         <ptype>2</ptype>
         <prefix>")) AS [RANDSTR] WHERE [RANDNUM]=[RANDNUM]</prefix>
-        <suffix>-- </suffix>
+        <suffix>[GENERIC_SQL_COMMENT]</suffix>
     </boundary>
 
     <boundary>
@@ -500,7 +500,7 @@ Formats:
         <where>1,2</where>
         <ptype>1</ptype>
         <prefix>)) AS [RANDSTR] WHERE [RANDNUM]=[RANDNUM]</prefix>
-        <suffix>-- </suffix>
+        <suffix>[GENERIC_SQL_COMMENT]</suffix>
     </boundary>
 
     <boundary>
@@ -509,7 +509,7 @@ Formats:
         <where>1,2</where>
         <ptype>2</ptype>
         <prefix>') AS [RANDSTR] WHERE [RANDNUM]=[RANDNUM]</prefix>
-        <suffix>-- </suffix>
+        <suffix>[GENERIC_SQL_COMMENT]</suffix>
     </boundary>
 
     <boundary>
@@ -518,7 +518,7 @@ Formats:
         <where>1,2</where>
         <ptype>4</ptype>
         <prefix>") AS [RANDSTR] WHERE [RANDNUM]=[RANDNUM]</prefix>
-        <suffix>-- </suffix>
+        <suffix>[GENERIC_SQL_COMMENT]</suffix>
     </boundary>
 
     <boundary>
@@ -527,7 +527,7 @@ Formats:
         <where>1,2</where>
         <ptype>1</ptype>
         <prefix>) AS [RANDSTR] WHERE [RANDNUM]=[RANDNUM]</prefix>
-        <suffix>-- </suffix>
+        <suffix>[GENERIC_SQL_COMMENT]</suffix>
     </boundary>
 
     <boundary>
@@ -536,7 +536,7 @@ Formats:
         <where>1</where>
         <ptype>1</ptype>
         <prefix>` WHERE [RANDNUM]=[RANDNUM]</prefix>
-        <suffix>-- </suffix>
+        <suffix>[GENERIC_SQL_COMMENT]</suffix>
     </boundary>
 
     <boundary>
@@ -545,7 +545,7 @@ Formats:
         <where>1</where>
         <ptype>1</ptype>
         <prefix>`) WHERE [RANDNUM]=[RANDNUM]</prefix>
-        <suffix>-- </suffix>
+        <suffix>[GENERIC_SQL_COMMENT]</suffix>
     </boundary>
     <!-- End of pre-WHERE derived table boundaries -->
 
diff --git a/xml/payloads/01_boolean_blind.xml b/xml/payloads/01_boolean_blind.xml
index 386e167f4..6c85eb582 100644
--- a/xml/payloads/01_boolean_blind.xml
+++ b/xml/payloads/01_boolean_blind.xml
@@ -212,7 +212,7 @@ Tag: <test>
         <vector>AND [INFERENCE]</vector>
         <request>
             <payload>AND [RANDNUM]=[RANDNUM]</payload>
-            <comment>-- -</comment>
+            <comment>[GENERIC_SQL_COMMENT]</comment>
         </request>
         <response>
             <comparison>AND [RANDNUM]=[RANDNUM1]</comparison>
@@ -229,7 +229,7 @@ Tag: <test>
         <vector>OR [INFERENCE]</vector>
         <request>
             <payload>OR [RANDNUM]=[RANDNUM]</payload>
-            <comment>-- -</comment>
+            <comment>[GENERIC_SQL_COMMENT]</comment>
         </request>
         <response>
             <comparison>OR [RANDNUM]=[RANDNUM1]</comparison>
@@ -246,7 +246,7 @@ Tag: <test>
         <vector>OR NOT [INFERENCE]</vector>
         <request>
             <payload>OR NOT [RANDNUM]=[RANDNUM]</payload>
-            <comment>-- -</comment>
+            <comment>[GENERIC_SQL_COMMENT]</comment>
         </request>
         <response>
             <comparison>OR NOT [RANDNUM]=[RANDNUM1]</comparison>
diff --git a/xml/payloads/06_union_query.xml b/xml/payloads/06_union_query.xml
index 507bf0845..ebbbe7dd8 100644
--- a/xml/payloads/06_union_query.xml
+++ b/xml/payloads/06_union_query.xml
@@ -12,7 +12,7 @@
         <vector>[UNION]</vector>
         <request>
             <payload/>
-            <comment>-- -</comment>
+            <comment>[GENERIC_SQL_COMMENT]</comment>
             <char>[CHAR]</char>
             <columns>[COLSTART]-[COLSTOP]</columns>
         </request>
@@ -31,7 +31,7 @@
         <vector>[UNION]</vector>
         <request>
             <payload/>
-            <comment>-- -</comment>
+            <comment>[GENERIC_SQL_COMMENT]</comment>
             <char>NULL</char>
             <columns>[COLSTART]-[COLSTOP]</columns>
         </request>
@@ -50,7 +50,7 @@
         <vector>[UNION]</vector>
         <request>
             <payload/>
-            <comment>-- -</comment>
+            <comment>[GENERIC_SQL_COMMENT]</comment>
             <char>[RANDNUM]</char>
             <columns>[COLSTART]-[COLSTOP]</columns>
         </request>
@@ -69,7 +69,7 @@
         <vector>[UNION]</vector>
         <request>
             <payload/>
-            <comment>-- -</comment>
+            <comment>[GENERIC_SQL_COMMENT]</comment>
             <char>[CHAR]</char>
             <columns>1-10</columns>
         </request>
@@ -88,7 +88,7 @@
         <vector>[UNION]</vector>
         <request>
             <payload/>
-            <comment>-- -</comment>
+            <comment>[GENERIC_SQL_COMMENT]</comment>
             <char>NULL</char>
             <columns>1-10</columns>
         </request>
@@ -107,7 +107,7 @@
         <vector>[UNION]</vector>
         <request>
             <payload/>
-            <comment>-- -</comment>
+            <comment>[GENERIC_SQL_COMMENT]</comment>
             <char>[RANDNUM]</char>
             <columns>1-10</columns>
         </request>
@@ -126,7 +126,7 @@
         <vector>[UNION]</vector>
         <request>
             <payload/>
-            <comment>-- -</comment>
+            <comment>[GENERIC_SQL_COMMENT]</comment>
             <char>[CHAR]</char>
             <columns>11-20</columns>
         </request>
@@ -145,7 +145,7 @@
         <vector>[UNION]</vector>
         <request>
             <payload/>
-            <comment>-- -</comment>
+            <comment>[GENERIC_SQL_COMMENT]</comment>
             <char>NULL</char>
             <columns>11-20</columns>
         </request>
@@ -164,7 +164,7 @@
         <vector>[UNION]</vector>
         <request>
             <payload/>
-            <comment>-- -</comment>
+            <comment>[GENERIC_SQL_COMMENT]</comment>
             <char>[RANDNUM]</char>
             <columns>11-20</columns>
         </request>
@@ -183,7 +183,7 @@
         <vector>[UNION]</vector>
         <request>
             <payload/>
-            <comment>-- -</comment>
+            <comment>[GENERIC_SQL_COMMENT]</comment>
             <char>[CHAR]</char>
             <columns>21-30</columns>
         </request>
@@ -202,7 +202,7 @@
         <vector>[UNION]</vector>
         <request>
             <payload/>
-            <comment>-- -</comment>
+            <comment>[GENERIC_SQL_COMMENT]</comment>
             <char>NULL</char>
             <columns>21-30</columns>
         </request>
@@ -221,7 +221,7 @@
         <vector>[UNION]</vector>
         <request>
             <payload/>
-            <comment>-- -</comment>
+            <comment>[GENERIC_SQL_COMMENT]</comment>
             <char>[RANDNUM]</char>
             <columns>21-30</columns>
         </request>
@@ -240,7 +240,7 @@
         <vector>[UNION]</vector>
         <request>
             <payload/>
-            <comment>-- -</comment>
+            <comment>[GENERIC_SQL_COMMENT]</comment>
             <char>[CHAR]</char>
             <columns>31-40</columns>
         </request>
@@ -259,7 +259,7 @@
         <vector>[UNION]</vector>
         <request>
             <payload/>
-            <comment>-- -</comment>
+            <comment>[GENERIC_SQL_COMMENT]</comment>
             <char>NULL</char>
             <columns>31-40</columns>
         </request>
@@ -278,7 +278,7 @@
         <vector>[UNION]</vector>
         <request>
             <payload/>
-            <comment>-- -</comment>
+            <comment>[GENERIC_SQL_COMMENT]</comment>
             <char>[RANDNUM]</char>
             <columns>31-40</columns>
         </request>
@@ -297,7 +297,7 @@
         <vector>[UNION]</vector>
         <request>
             <payload/>
-            <comment>-- -</comment>
+            <comment>[GENERIC_SQL_COMMENT]</comment>
             <char>[CHAR]</char>
             <columns>41-50</columns>
         </request>
@@ -315,7 +315,7 @@
         <vector>[UNION]</vector>
         <request>
             <payload/>
-            <comment>-- -</comment>
+            <comment>[GENERIC_SQL_COMMENT]</comment>
             <char>NULL</char>
             <columns>41-50</columns>
         </request>
@@ -334,7 +334,7 @@
         <vector>[UNION]</vector>
         <request>
             <payload/>
-            <comment>-- -</comment>
+            <comment>[GENERIC_SQL_COMMENT]</comment>
             <char>[RANDNUM]</char>
             <columns>41-50</columns>
         </request>