Bugfix for orpheaned node