Merge "Fix node"