Fixes issues experienced in #448

...ion (specifically for Node.js JSDOM des)"