fixed client solution to include client util