fixed rpc service stuff