Fix Client:handler