Fix client helper