Fix for inclusion of plugins