Fixing the plugin