[RPC #6] Quick hack