Fixing module loading