Modify handling rpc-port request