Repairing drain-aquifer layer counting.