Fixed commonjs bug