Issue #3; a bit of a hack, but seems like node does the same