Attempt two and InvalidPluginException fix.