fix from geoserver upgrade