fixed client setup