Fix drain bug