Merge fix for plugins