Fix base rpc, old one is running out of calls.

Fix base rpc, old one is running out of calls. #233