Fix for plugin