Fixed commonjs support