Rpc context reference fixed