--- a/core/moduleapi.lua	Thu Sep 18 10:21:38 2014 +0200
+++ b/core/moduleapi.lua	Tue Sep 23 00:23:33 2014 +0200
@@ -370,7 +370,9 @@
 	return require"core.storagemanager".open(self.host, name or self.name, type);
 end
 
-return function (mm)
+function api.init(mm)
 	modulemanager = mm;
 	return api;
 end
+
+return api;

--- a/core/modulemanager.lua	Thu Sep 18 10:21:38 2014 +0200
+++ b/core/modulemanager.lua	Tue Sep 23 00:23:33 2014 +0200
@@ -37,7 +37,7 @@
 
 module "modulemanager"
 
-local api = _G.require "core.moduleapi"(_M); -- Module API container
+local api = _G.require "core.moduleapi".init(_M); -- Module API container
 
 -- [host] = { [module] = module_env }
 local modulemap = { ["*"] = {} };