Minor fix to a flaw in the logic of the node dictionary fix.
Merge remote-tracking branch 'orvid/master'