diff --git a/lib/core/common.py b/lib/core/common.py
index 2ef100c41..94f32d157 100644
--- a/lib/core/common.py
+++ b/lib/core/common.py
@@ -959,7 +959,7 @@ def cleanQuery(query):
             sqlStatementEsc = sqlStatement.replace("(", "\\(")
             queryMatch = re.search("(%s)" % sqlStatementEsc, query, re.I)
 
-            if queryMatch:
+            if queryMatch and "sys_exec" not in query:
                 upperQuery = upperQuery.replace(queryMatch.group(1), sqlStatement.upper())
 
     return upperQuery
diff --git a/xml/payloads.xml b/xml/payloads.xml
index b51ff2373..15c696a84 100644
--- a/xml/payloads.xml
+++ b/xml/payloads.xml
@@ -1834,7 +1834,7 @@ Formats:
         <vector>; IF(([INFERENCE]),SLEEP([SLEEPTIME]),[RANDNUM]);</vector>
         <request>
             <payload>; SELECT SLEEP([SLEEPTIME]);</payload>
-            <comment>#</comment>
+            <comment>--</comment>
         </request>
         <response>
             <time>[SLEEPTIME]</time>
@@ -1855,7 +1855,7 @@ Formats:
         <vector>; IF(([INFERENCE]),BENCHMARK([SLEEPTIME]000000,MD5('[RANDSTR]')),[RANDNUM]);</vector>
         <request>
             <payload>; SELECT BENCHMARK([SLEEPTIME]000000,MD5('[RANDSTR]'));</payload>
-            <comment>#</comment>
+            <comment>--</comment>
         </request>
         <response>
             <time>[DELAYED]</time>