Fix Client handler