Fix client fallback