Client deletion fix