diff --git a/lib/core/agent.py b/lib/core/agent.py
index 1f8e8eca7..af681e0e0 100644
--- a/lib/core/agent.py
+++ b/lib/core/agent.py
@@ -389,7 +389,7 @@ class Agent:
             fieldsToCastStr = fieldsNoSelect
 
         # Function
-        if re.search("\A\w+\(.*\)", fieldsToCastStr, re.I) or fieldsSelectCase or fieldsSubstr:
+        if re.search("\A\w+\(.*\)", fieldsToCastStr, re.I) or (fieldsSelectCase and "WHEN use" not in query) or fieldsSubstr:
             fieldsToCastList = [fieldsToCastStr]
         else:
             fieldsToCastList = fieldsToCastStr.replace(", ", ",")
diff --git a/plugins/generic/enumeration.py b/plugins/generic/enumeration.py
index 5a5d04022..da08cebdb 100644
--- a/plugins/generic/enumeration.py
+++ b/plugins/generic/enumeration.py
@@ -587,7 +587,7 @@ class Enumeration:
 
                         for priv in privs:
                             if priv.isdigit() and int(priv) == 1:
-                                for position, pgsqlPriv in pgsqlPrivs:
+                                for position, pgsqlPriv in pgsqlPrivs.items():
                                     if position == i:
                                         privileges.add(pgsqlPriv)
 
@@ -607,7 +607,7 @@ class Enumeration:
 
                         for priv in privs:
                             if priv.upper() == "Y":
-                                for position, mysqlPriv in mysqlPrivs:
+                                for position, mysqlPriv in mysqlPrivs.items():
                                     if position == i:
                                         privileges.add(mysqlPriv)