#17 make this work in common-node