Fixing module loading bug