Fix client support.