diff --git a/lib/core/agent.py b/lib/core/agent.py
index a6d07da8c..319938c3d 100644
--- a/lib/core/agent.py
+++ b/lib/core/agent.py
@@ -443,7 +443,7 @@ class Agent(object):
         elif fieldsSelectFrom:
             _ = zeroDepthSearch(query, " FROM ")
             fieldsToCastStr = query[:unArrayizeValue(_)] if _ else query
-            fieldsToCastStr = re.sub(r"\ASELECT\s+", "", fieldsToCastStr)
+            fieldsToCastStr = re.sub(r"\ASELECT%s\s+" % prefixRegex, "", fieldsToCastStr)
         elif fieldsSelect:
             fieldsToCastStr = fieldsSelect.groups()[0]
         else: