fixed for CommonJS