Better fix for #591: introduce nodeIdCompat for more comprehensive fix
snapshot