Fix for plugin loading