diff --git a/lib/core/target.py b/lib/core/target.py
index 05353b873..82e32507e 100644
--- a/lib/core/target.py
+++ b/lib/core/target.py
@@ -77,7 +77,9 @@ def __setRequestParams():
 
     # Perform checks on Cookie parameters
     if conf.cookie:
-        urlDecodedCookie = urldecode(conf.cookie).replace("%", "%%")
+        # TODO: sure about decoding the cookie?
+        #urlDecodedCookie = urldecode(conf.cookie).replace("%", "%%")
+        urlDecodedCookie = conf.cookie.replace("%", "%%")
         conf.parameters["Cookie"] = urlDecodedCookie
         __paramDict = paramToDict("Cookie", urlDecodedCookie)
 
diff --git a/lib/request/connect.py b/lib/request/connect.py
index d7b68b7e8..73f08ba8f 100644
--- a/lib/request/connect.py
+++ b/lib/request/connect.py
@@ -105,7 +105,9 @@ class Connect:
         requestMsg += " HTTP/1.1"
 
         if cookie:
-            cookie = urlencode(cookie).replace("%%", "%")
+            # TODO: sure about encoding the cookie?
+            #cookie = urlencode(cookie).replace("%%", "%")
+            cookie = cookie.replace("%%", "%")
 
         try:
             # Perform HTTP request