Fix client setup bug