Upgrade node for #811