Fix for new system plugins