diff --git a/scripts/supybot b/scripts/supybot
index 80d347688..12edece14 100644
--- a/scripts/supybot
+++ b/scripts/supybot
@@ -314,7 +314,7 @@ if __name__ == '__main__':
             sys.exit(-1)
 
     conf.allowDefaultOwner = options.allowDefaultOwner
-    conf.disableMultiprocessing = options.disableMultiprocessing
+    world.disableMultiprocessing = options.disableMultiprocessing
 
     if not os.path.exists(conf.supybot.directories.log()):
         os.mkdir(conf.supybot.directories.log())
diff --git a/scripts/supybot-test b/scripts/supybot-test
index 30f3a30bb..21a839d1c 100644
--- a/scripts/supybot-test
+++ b/scripts/supybot-test
@@ -152,7 +152,7 @@ if __name__ == '__main__':
                       help='Disables multiprocessing stuff.')
     (options, args) = parser.parse_args()
 
-    conf.disableMultiprocessing = options.disableMultiprocessing
+    world.disableMultiprocessing = options.disableMultiprocessing
 
     # This must go before checking for args, of course.
     for pluginDir in options.pluginsDirs:
diff --git a/src/commands.py b/src/commands.py
index 72c5884ac..d45d34078 100644
--- a/src/commands.py
+++ b/src/commands.py
@@ -86,7 +86,7 @@ def process(f, *args, **kwargs):
     if resource and heap_size is None:
         heap_size = resource.RLIM_INFINITY
 
-    if conf.disableMultiprocessing:
+    if world.disableMultiprocessing:
         pn = kwargs.pop('pn', 'Unknown')
         cn = kwargs.pop('cn', 'unknown')
         try: