almost fixed module mapping bug