Another fix for new system plugins