finally resolved the plugin mess