Better fix for plugins