Same patch to index.js