Fixing commonjs broken integration