diff --git a/lib/core/agent.py b/lib/core/agent.py
index 13b925640..4cc0d4791 100644
--- a/lib/core/agent.py
+++ b/lib/core/agent.py
@@ -328,7 +328,7 @@ class Agent:
         if not Backend.getDbms():
             return fields
 
-        if (fields.startswith("(CASE") and "WHEN use" in fields) or fields.startswith("SUBSTR"):
+        if fields.startswith("(CASE") or fields.startswith("SUBSTR"):
             nulledCastedConcatFields = fields
         else:
             fields = fields.replace(", ", ",")