Fix in the plugins