Fix client call on servers