diff --git a/lib/controller/controller.py b/lib/controller/controller.py
index b64c8813a..302d99e97 100644
--- a/lib/controller/controller.py
+++ b/lib/controller/controller.py
@@ -37,8 +37,8 @@ from lib.core.data import kb
 from lib.core.data import logger
 from lib.core.exception import sqlmapNotVulnerableException
 from lib.core.session import setInjection
-from lib.core.target import createTargetDirs
-from lib.core.target import initTargetEnv, setupTargetEnv
+from lib.core.target import initTargetEnv
+from lib.core.target import setupTargetEnv
 from lib.utils.parenthesis import checkForParenthesis
 
 def __selectInjection(injData):
@@ -136,7 +136,6 @@ def start():
         
         initTargetEnv()
         parseTargetUrl()
-        createTargetDirs()
         setupTargetEnv()
 
         if not checkConnection() or not checkString() or not checkRegexp():
diff --git a/lib/core/target.py b/lib/core/target.py
index baae6a140..d8547506c 100644
--- a/lib/core/target.py
+++ b/lib/core/target.py
@@ -194,7 +194,7 @@ def __createDumpDir():
     if not os.path.isdir(conf.dumpPath):
         os.makedirs(conf.dumpPath, 0755)
 
-def createTargetDirs():
+def __createTargetDirs():
     """
     Create the output directory.
     """
@@ -232,5 +232,6 @@ def initTargetEnv():
         kb.unionPosition  = None
 
 def setupTargetEnv():
+    __createTargetDirs()
     __setRequestParams()
     __setOutputResume()