Fix nodes for stack overflow fix