CFY-494 fix bug with related node