cleaner bug fix