Restored RPC, fixed #4.