Add Client fix

Add Client fix