I think we'd better to handle this in another commit to raft.