WATER fix