Potential fix against #19

This seems to work for us against issue #19 - where commonjs names are resolved so they don't work in other code.

Is this enough of a fix or is something else required?