Bug fix on groundwater sites