Fixed the drowning bug