CommonJS fix