Bug fix

for WaterFlow