fix all variants of RPC