Fixed trace_water()