Drowned bug fix