Work around the v5b12 plugin change