commonjs closure fix v2