Added the support for uncleaned clients.