CLIENT_ONLY mode fix