Flood bug fix