Bug fix in the cleaning service