CGIV-1013: Bugfix on node overriding