diff --git a/lib/core/agent.py b/lib/core/agent.py
index b46749810..098543422 100644
--- a/lib/core/agent.py
+++ b/lib/core/agent.py
@@ -218,7 +218,7 @@ class Agent(object):
             comment = kb.injection.data[kb.technique].comment if comment is None else comment
 
         if Backend.getIdentifiedDbms() == DBMS.ACCESS and comment == GENERIC_SQL_COMMENT:
-            comment = "%00"
+            comment = queries[DBMS.ACCESS].comment.query
 
         if comment is not None:
             expression += comment
diff --git a/xml/queries.xml b/xml/queries.xml
index b6a3f6d4d..17a756cbb 100644
--- a/xml/queries.xml
+++ b/xml/queries.xml
@@ -355,7 +355,7 @@
         <limitstring query=" TOP "/>
         <order query="ORDER BY %s ASC"/>
         <count query="COUNT(%s)"/>
-        <comment query="%00"/>
+        <comment query="%16" query2="%00"/>
         <substring query="MID((%s),%d,%d)"/>
         <concatenate query="%s&amp;%s"/>
         <case query="SELECT (IIF(%s,1,0))"/>