--- a/core/modulemanager.lua	Fri Mar 18 14:03:14 2016 +0000
+++ b/core/modulemanager.lua	Sat Mar 19 16:35:43 2016 +0100
@@ -125,7 +125,9 @@
 	end
 
 	if modulemap[host][module_name] then
-		log("debug", "%s is already loaded for %s, so not loading again", module_name, host);
+		if not modulemap["*"][module_name] then
+			log("debug", "%s is already loaded for %s, so not loading again", module_name, host);
+		end
 		return nil, "module-already-loaded";
 	elseif modulemap["*"][module_name] then
 		local mod = modulemap["*"][module_name];