Fixed commonjs setup