Clean bug fix