node fix for older versions
Merge branch 'master' into sm