Bugfix for orpheaned node
Merge pull request #1 from clochix/master

Bugfix for orpheaned node