Fix 2 for #187
Added node id
Merge pull request #189 from jbreuer/patch-3

Fix 2 for #187