Complete fix for plugins