Fixed module loading, this way it loads correctly