diff --git a/doc/THANKS b/doc/THANKS
index 8d6244dc4..1eb8e33d4 100644
--- a/doc/THANKS
+++ b/doc/THANKS
@@ -565,6 +565,9 @@ Brandon E. <brandonpoc@gmail.com>
 black zero <timeisflowing@gmail.com>
     for reporting a minor bug
 
+blueBoy <blueboy4444@gmail.com>
+    for reporting a bug
+
 buawig <buawig@gmail.com>
     for reporting considerable amount of bugs
 
diff --git a/lib/core/agent.py b/lib/core/agent.py
index a09cfa8e7..83684c2b0 100644
--- a/lib/core/agent.py
+++ b/lib/core/agent.py
@@ -560,8 +560,8 @@ class Agent:
 
         if limited:
             inbandQuery += ",".join(map(lambda x: char if x != position else '(SELECT %s)' % query, range(0, count)))
-            inbandQuery = self.suffixQuery(inbandQuery, comment, suffix)
             inbandQuery += FROM_TABLE.get(Backend.getIdentifiedDbms(), "")
+            inbandQuery = self.suffixQuery(inbandQuery, comment, suffix)
 
             return inbandQuery
 
diff --git a/plugins/generic/enumeration.py b/plugins/generic/enumeration.py
index 7feec85dc..5d0aef64b 100644
--- a/plugins/generic/enumeration.py
+++ b/plugins/generic/enumeration.py
@@ -2352,6 +2352,8 @@ class Enumeration:
         sqlType = None
         getOutput = None
 
+        query = query.rstrip(';')
+
         for sqlTitle, sqlStatements in SQL_STATEMENTS.items():
             for sqlStatement in sqlStatements:
                 if query.lower().startswith(sqlStatement):