fixed support for plugins