Fixing issues with multiple module loading