Fixed deregistration of clients