Change to direct access to plugin.