support current master of node
saner persistent handling, squash a potential leak