Fix: puddle problem