ClientSide fallback fix