Fix Drain()