Commonjs fix