real fix for node.js --once more with feeling
merge dev 1.8.1