Change check on node instead of property