ModuleRegistry fix