Fix Client