Fixed module loading