Hopefully removed incompatibility with CommonJS