Proxy nodes fix

These changes were lost during merging `master` branch into `Reach` one.
move it out into separate method