Fix for plugin_storage