diff --git a/lib/core/agent.py b/lib/core/agent.py
index fe48c4e0a..fd8e6cde1 100644
--- a/lib/core/agent.py
+++ b/lib/core/agent.py
@@ -623,13 +623,10 @@ class Agent:
         retVal = inpStr
 
         if inpStr:
-            if urlencode_:
-                regObj = getCompiledRegex("(?P<result>%s.*?%s)" % (PAYLOAD_DELIMITER, PAYLOAD_DELIMITER))
+            retVal = retVal.replace(PAYLOAD_DELIMITER, '')
 
-                for match in regObj.finditer(inpStr):
-                    retVal = retVal.replace(match.group("result"), urlencode(match.group("result")[1:-1], convall=True))
-            else:
-                retVal = retVal.replace(PAYLOAD_DELIMITER, '')
+            if urlencode_:
+                retVal = urlencode(retVal)
 
         return retVal