polish on the rpc server side