Fixed the module loading