Should we be making a check against the node_type?