CorePlugins fix.