Fix CommonJS issue