Bugfix for rpc context