Fixed CommonJS bug