WaterVase fix